From 939176f4a556ed38570db6e6735ba44a1015ea67 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 18 Oct 2021 00:42:35 +0200 Subject: [PATCH] Do not set the palette for every component This makes it properly display disabled checkboxes as grey. CCBUG: 406295 --- org.kde.desktop/BusyIndicator.qml | 1 - org.kde.desktop/Button.qml | 1 - org.kde.desktop/CheckBox.qml | 1 - org.kde.desktop/CheckDelegate.qml | 1 - org.kde.desktop/ComboBox.qml | 1 - org.kde.desktop/Container.qml | 1 - org.kde.desktop/Control.qml | 1 - org.kde.desktop/DelayButton.qml | 1 - org.kde.desktop/Dial.qml | 1 - org.kde.desktop/Dialog.qml | 1 - org.kde.desktop/Drawer.qml | 1 - org.kde.desktop/Frame.qml | 1 - org.kde.desktop/GroupBox.qml | 1 - org.kde.desktop/ItemDelegate.qml | 1 - org.kde.desktop/Menu.qml | 1 - org.kde.desktop/MenuBar.qml | 1 - org.kde.desktop/MenuBarItem.qml | 1 - org.kde.desktop/MenuItem.qml | 1 - org.kde.desktop/Popup.qml | 1 - org.kde.desktop/ProgressBar.qml | 1 - org.kde.desktop/RadioButton.qml | 1 - org.kde.desktop/RadioDelegate.qml | 1 - org.kde.desktop/RangeSlider.qml | 1 - org.kde.desktop/ScrollBar.qml | 1 - org.kde.desktop/ScrollView.qml | 1 - org.kde.desktop/Slider.qml | 1 - org.kde.desktop/SpinBox.qml | 1 - org.kde.desktop/Switch.qml | 1 - org.kde.desktop/SwitchDelegate.qml | 1 - org.kde.desktop/TabBar.qml | 1 - org.kde.desktop/TabButton.qml | 1 - org.kde.desktop/TextArea.qml | 1 - org.kde.desktop/TextField.qml | 1 - org.kde.desktop/ToolBar.qml | 2 -- org.kde.desktop/ToolButton.qml | 1 - org.kde.desktop/ToolTip.qml | 1 - tests/CheckBox.qml | 4 ++++ 37 files changed, 4 insertions(+), 37 deletions(-) diff --git a/org.kde.desktop/BusyIndicator.qml b/org.kde.desktop/BusyIndicator.qml index 5d0741a..cf974d4 100644 --- a/org.kde.desktop/BusyIndicator.qml +++ b/org.kde.desktop/BusyIndicator.qml @@ -13,7 +13,6 @@ import QtQuick.Templates @QQC2_VERSION@ as T T.BusyIndicator { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding diff --git a/org.kde.desktop/Button.qml b/org.kde.desktop/Button.qml index f1fd394..3588580 100644 --- a/org.kde.desktop/Button.qml +++ b/org.kde.desktop/Button.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.Button { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.Button Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/CheckBox.qml b/org.kde.desktop/CheckBox.qml index ac38992..37adc7b 100644 --- a/org.kde.desktop/CheckBox.qml +++ b/org.kde.desktop/CheckBox.qml @@ -15,7 +15,6 @@ import "private" T.CheckBox { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/CheckDelegate.qml b/org.kde.desktop/CheckDelegate.qml index 10423c2..ab2f926 100644 --- a/org.kde.desktop/CheckDelegate.qml +++ b/org.kde.desktop/CheckDelegate.qml @@ -14,7 +14,6 @@ import "private" T.CheckDelegate { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding diff --git a/org.kde.desktop/ComboBox.qml b/org.kde.desktop/ComboBox.qml index dd8bcdd..10da298 100644 --- a/org.kde.desktop/ComboBox.qml +++ b/org.kde.desktop/ComboBox.qml @@ -17,7 +17,6 @@ import "private" as Private T.ComboBox { id: controlRoot - palette: Kirigami.Theme.palette //NOTE: typeof necessary to not have warnings on Qt 5.7 Kirigami.Theme.colorSet: typeof(editable) != "undefined" && editable ? Kirigami.Theme.View : Kirigami.Theme.Button Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/Container.qml b/org.kde.desktop/Container.qml index f2472b8..4723184 100644 --- a/org.kde.desktop/Container.qml +++ b/org.kde.desktop/Container.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.Container { id: control - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/Control.qml b/org.kde.desktop/Control.qml index 7da045f..aa82e64 100644 --- a/org.kde.desktop/Control.qml +++ b/org.kde.desktop/Control.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.Control { id: control - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/DelayButton.qml b/org.kde.desktop/DelayButton.qml index fe8e3f8..e1a6487 100644 --- a/org.kde.desktop/DelayButton.qml +++ b/org.kde.desktop/DelayButton.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.DelayButton { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.Button Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/Dial.qml b/org.kde.desktop/Dial.qml index d9dc29a..d0d69d8 100644 --- a/org.kde.desktop/Dial.qml +++ b/org.kde.desktop/Dial.qml @@ -15,7 +15,6 @@ import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate T.Dial { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: 128 implicitHeight: 128 diff --git a/org.kde.desktop/Dialog.qml b/org.kde.desktop/Dialog.qml index 8b50e83..1c7b9d2 100644 --- a/org.kde.desktop/Dialog.qml +++ b/org.kde.desktop/Dialog.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.12 as Kirigami T.Dialog { id: control - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/Drawer.qml b/org.kde.desktop/Drawer.qml index 45d40fe..96d8713 100644 --- a/org.kde.desktop/Drawer.qml +++ b/org.kde.desktop/Drawer.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.Drawer { id: control - palette: Kirigami.Theme.palette parent: T.ApplicationWindow.overlay implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) diff --git a/org.kde.desktop/Frame.qml b/org.kde.desktop/Frame.qml index b4bb5d5..491e8a0 100644 --- a/org.kde.desktop/Frame.qml +++ b/org.kde.desktop/Frame.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.Frame { id: control - palette: Kirigami.Theme.palette implicitWidth: contentWidth + leftPadding + rightPadding implicitHeight: contentHeight + topPadding + bottomPadding diff --git a/org.kde.desktop/GroupBox.qml b/org.kde.desktop/GroupBox.qml index 1afd652..37b8ad1 100644 --- a/org.kde.desktop/GroupBox.qml +++ b/org.kde.desktop/GroupBox.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.GroupBox { id: control - palette: Kirigami.Theme.palette implicitWidth: contentWidth + leftPadding + rightPadding implicitHeight: contentHeight + topPadding + bottomPadding diff --git a/org.kde.desktop/ItemDelegate.qml b/org.kde.desktop/ItemDelegate.qml index a8cdfc5..4093316 100644 --- a/org.kde.desktop/ItemDelegate.qml +++ b/org.kde.desktop/ItemDelegate.qml @@ -14,7 +14,6 @@ import "private" T.ItemDelegate { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding diff --git a/org.kde.desktop/Menu.qml b/org.kde.desktop/Menu.qml index e830fb4..adaf644 100644 --- a/org.kde.desktop/Menu.qml +++ b/org.kde.desktop/Menu.qml @@ -15,7 +15,6 @@ import org.kde.kirigami 2.12 as Kirigami T.Menu { id: control - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/MenuBar.qml b/org.kde.desktop/MenuBar.qml index 8d828de..aa1d628 100644 --- a/org.kde.desktop/MenuBar.qml +++ b/org.kde.desktop/MenuBar.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.MenuBar { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, diff --git a/org.kde.desktop/MenuBarItem.qml b/org.kde.desktop/MenuBarItem.qml index d679cc4..5fa4fb5 100644 --- a/org.kde.desktop/MenuBarItem.qml +++ b/org.kde.desktop/MenuBarItem.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.MenuBarItem { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding baselineOffset: contentItem.y + contentItem.baselineOffset diff --git a/org.kde.desktop/MenuItem.qml b/org.kde.desktop/MenuItem.qml index 12c94af..d8a7cf0 100644 --- a/org.kde.desktop/MenuItem.qml +++ b/org.kde.desktop/MenuItem.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.MenuItem { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding + (arrow ? arrow.implicitWidth : 0)) implicitHeight: visible ? Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/Popup.qml b/org.kde.desktop/Popup.qml index 7d89ae6..c0ab6b0 100644 --- a/org.kde.desktop/Popup.qml +++ b/org.kde.desktop/Popup.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.12 as Kirigami T.Popup { id: control - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml index cfd9428..3bd59f3 100644 --- a/org.kde.desktop/ProgressBar.qml +++ b/org.kde.desktop/ProgressBar.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.ProgressBar { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: 250 implicitHeight: 22 diff --git a/org.kde.desktop/RadioButton.qml b/org.kde.desktop/RadioButton.qml index 93939c5..d976a23 100644 --- a/org.kde.desktop/RadioButton.qml +++ b/org.kde.desktop/RadioButton.qml @@ -15,7 +15,6 @@ import "private" T.RadioButton { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, diff --git a/org.kde.desktop/RadioDelegate.qml b/org.kde.desktop/RadioDelegate.qml index 6afb1ab..c5f6655 100644 --- a/org.kde.desktop/RadioDelegate.qml +++ b/org.kde.desktop/RadioDelegate.qml @@ -14,7 +14,6 @@ import "private" T.RadioDelegate { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding diff --git a/org.kde.desktop/RangeSlider.qml b/org.kde.desktop/RangeSlider.qml index 21d11f0..bebe89c 100644 --- a/org.kde.desktop/RangeSlider.qml +++ b/org.kde.desktop/RangeSlider.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.4 as Kirigami T.RangeSlider { id: control - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, Math.max(first.handle ? first.handle.implicitWidth : 0, second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) diff --git a/org.kde.desktop/ScrollBar.qml b/org.kde.desktop/ScrollBar.qml index 9e6ca1c..becb0a9 100644 --- a/org.kde.desktop/ScrollBar.qml +++ b/org.kde.desktop/ScrollBar.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.11 as Kirigami T.ScrollBar { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: background.implicitWidth implicitHeight: background.implicitHeight diff --git a/org.kde.desktop/ScrollView.qml b/org.kde.desktop/ScrollView.qml index 37f4044..1b5c12a 100644 --- a/org.kde.desktop/ScrollView.qml +++ b/org.kde.desktop/ScrollView.qml @@ -17,7 +17,6 @@ T.ScrollView { clip: true - palette: Kirigami.Theme.palette implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) diff --git a/org.kde.desktop/Slider.qml b/org.kde.desktop/Slider.qml index 7fa3039..fe4a3c6 100644 --- a/org.kde.desktop/Slider.qml +++ b/org.kde.desktop/Slider.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.Slider { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.Button implicitWidth: background.horizontal ? Kirigami.Units.gridUnit * 12 : background.implicitWidth diff --git a/org.kde.desktop/SpinBox.qml b/org.kde.desktop/SpinBox.qml index 694af1d..f4764ae 100644 --- a/org.kde.desktop/SpinBox.qml +++ b/org.kde.desktop/SpinBox.qml @@ -14,7 +14,6 @@ import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate T.SpinBox { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/Switch.qml b/org.kde.desktop/Switch.qml index 5b6f80b..2e5d111 100644 --- a/org.kde.desktop/Switch.qml +++ b/org.kde.desktop/Switch.qml @@ -13,7 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.CheckBox { id: control - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding diff --git a/org.kde.desktop/SwitchDelegate.qml b/org.kde.desktop/SwitchDelegate.qml index 6e8bed9..9fbc038 100644 --- a/org.kde.desktop/SwitchDelegate.qml +++ b/org.kde.desktop/SwitchDelegate.qml @@ -14,7 +14,6 @@ import "private" T.SwitchDelegate { id: controlRoot - palette: Kirigami.Theme.palette implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding diff --git a/org.kde.desktop/TabBar.qml b/org.kde.desktop/TabBar.qml index d46ed70..a555be2 100644 --- a/org.kde.desktop/TabBar.qml +++ b/org.kde.desktop/TabBar.qml @@ -14,7 +14,6 @@ import QtQuick.Templates @QQC2_VERSION@ as T T.TabBar { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.Window Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/TabButton.qml b/org.kde.desktop/TabButton.qml index ba39d2a..bbc1637 100644 --- a/org.kde.desktop/TabButton.qml +++ b/org.kde.desktop/TabButton.qml @@ -17,7 +17,6 @@ import org.kde.kirigami 2.4 as Kirigami T.TabButton { id: controlRoot - palette: Kirigami.Theme.palette //Some qstyles like fusion don't have correct pixel metrics here and just return 0 implicitWidth: Math.max(styleitem.implicitWidth, textMetrics.width + Kirigami.Units.gridUnit * 2) implicitHeight: styleitem.implicitHeight || Kirigami.Units.gridUnit * 2 diff --git a/org.kde.desktop/TextArea.qml b/org.kde.desktop/TextArea.qml index dfcdd7e..0469fba 100644 --- a/org.kde.desktop/TextArea.qml +++ b/org.kde.desktop/TextArea.qml @@ -17,7 +17,6 @@ import "private" as Private T.TextArea { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/TextField.qml b/org.kde.desktop/TextField.qml index 9e2a216..39801e1 100644 --- a/org.kde.desktop/TextField.qml +++ b/org.kde.desktop/TextField.qml @@ -16,7 +16,6 @@ import "private" as Private T.TextField { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.inherit: false diff --git a/org.kde.desktop/ToolBar.qml b/org.kde.desktop/ToolBar.qml index 99a71f2..8c26c69 100644 --- a/org.kde.desktop/ToolBar.qml +++ b/org.kde.desktop/ToolBar.qml @@ -13,8 +13,6 @@ import org.kde.kirigami 2.4 as Kirigami T.ToolBar { id: controlRoot - palette: Kirigami.Theme.palette - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) diff --git a/org.kde.desktop/ToolButton.qml b/org.kde.desktop/ToolButton.qml index 48f1db3..309aa1d 100644 --- a/org.kde.desktop/ToolButton.qml +++ b/org.kde.desktop/ToolButton.qml @@ -14,7 +14,6 @@ import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate T.ToolButton { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: flat ? Kirigami.Theme.Window : Kirigami.Theme.Button Kirigami.Theme.inherit: flat diff --git a/org.kde.desktop/ToolTip.qml b/org.kde.desktop/ToolTip.qml index a3e17ad..0138553 100644 --- a/org.kde.desktop/ToolTip.qml +++ b/org.kde.desktop/ToolTip.qml @@ -14,7 +14,6 @@ import org.kde.kirigami 2.12 as Kirigami T.ToolTip { id: controlRoot - palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip Kirigami.Theme.inherit: false diff --git a/tests/CheckBox.qml b/tests/CheckBox.qml index 346bef7..a1ad9c1 100644 --- a/tests/CheckBox.qml +++ b/tests/CheckBox.qml @@ -11,6 +11,10 @@ ApplicationWindow { CheckBox { } + CheckBox { + checked: true + enabled: false + } CheckBox { text: "text" -- GitLab