From 15c4c2e16b34f6081fc101a96e9917d4542a22db Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Tue, 9 Jan 2018 21:44:17 +0200 Subject: [PATCH] fix #831,use Latte CheckBoxStyle --there was a checkbox that provided a very big translation. By using our own style the text now breaks into two lines. --- .../configuration/LatteCheckBoxStyle.qml | 76 +++++++++++++++++++ .../contents/configuration/TweaksConfig.qml | 2 + 2 files changed, 78 insertions(+) create mode 100644 shell/package/contents/configuration/LatteCheckBoxStyle.qml diff --git a/shell/package/contents/configuration/LatteCheckBoxStyle.qml b/shell/package/contents/configuration/LatteCheckBoxStyle.qml new file mode 100644 index 000000000..edcd94677 --- /dev/null +++ b/shell/package/contents/configuration/LatteCheckBoxStyle.qml @@ -0,0 +1,76 @@ +/* +* Copyright 2016 Smith AR +* Michail Vourlakos +* +* This file is part of Latte-Dock +* +* Latte-Dock is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* Latte-Dock is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ +import QtQuick 2.0 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 +import QtGraphicalEffects 1.0 + +import QtQuick.Controls.Styles.Plasma 2.0 as PlasmaStyles + +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.components 2.0 as PlasmaComponents + +PlasmaStyles.CheckBoxStyle{ + label: PlasmaComponents.Label { + id: labelStyleTxt + text: control.text + wrapMode: Text.WordWrap + elide: Text.ElideNone + + Rectangle { + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.bottom + height: 1 * units.devicePixelRatio + color: theme.highlightColor + visible: control.activeFocus + } + } + + panel: Item { + implicitWidth: Math.round(row.implicitWidth + padding.left + padding.right) + implicitHeight: Math.round(row.implicitHeight + padding.top + padding.bottom) + + RowLayout { + id: row + + y: padding.top + x: padding.left + width: parent.width - padding.left - padding.right + spacing: checkboxStyle.spacing + + Loader { + id: indicatorLoader + + Layout.alignment: Qt.AlignTop + sourceComponent: indicator + } + + Loader { + id: labelLoader + + Layout.alignment: Qt.AlignTop + Layout.fillHeight: true + Layout.fillWidth: true + sourceComponent: label + } + } + } +} diff --git a/shell/package/contents/configuration/TweaksConfig.qml b/shell/package/contents/configuration/TweaksConfig.qml index f36f0c8c1..e7bfeac67 100644 --- a/shell/package/contents/configuration/TweaksConfig.qml +++ b/shell/package/contents/configuration/TweaksConfig.qml @@ -98,9 +98,11 @@ PlasmaComponents.Page { PlasmaComponents.CheckBox { id: solidForMaximizedChk Layout.leftMargin: units.smallSpacing * 2 + Layout.maximumWidth: dialog.maxWidth - 3*units.smallSpacing text: i18n("Force solid background for maximized or snapped windows") checked: plasmoid.configuration.solidBackgroundForMaximized tooltip: i18n("The panel background removes its transparency setting \n when there is a maximized or snapped window") + style: LatteCheckBoxStyle{} onClicked: { plasmoid.configuration.solidBackgroundForMaximized = checked;