diff --git a/org.kde.desktop/BusyIndicator.qml b/org.kde.desktop/BusyIndicator.qml index 5d0741a016be47fba36a59817bf9396f27d1d42a..cf974d4f8bf71e0657de47a875406e3a69fb31f0 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 f1fd394264d3cf4ce70d52ccd83fb4adbaabb288..35885809de13bae6c0ed85e110aae46186c6a151 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 ac389926bc22815ff95a707dc95e8bb87b06fa98..37adc7b5225ac3c3f57fd5db2a07f6f250516a13 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 10423c290e14d8b928558dd46fc9d6ddb99759be..ab2f9262ca5d207509b90f3cd87db01cb92b2a32 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 dd8bcdd9bb6b0cdfdd1c03eab144dc31ca4b0d82..10da2982ce9b26e971ea8752445d87869e22907e 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 f2472b839a03bf2d0a4be1638867ff9da2f22469..4723184ad9233e29702fcb21fce499d69bd85873 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 7da045f059c9ea70e5cfac569cf7bbd0bbcf44b3..aa82e64881d89493669974618b1fe2ee9c46ef60 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 fe8e3f81bc96f9f3f34944e997d649831016cecb..e1a6487964e1be17b0e40903d5297f83a3faaeb6 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 d9dc29aa89d0c90488f323c385555db280b67ef1..d0d69d858990719298d9480d32134c25cf9b0ddf 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 8b50e8325c3af1450a3330c42d7526aeceec7341..1c7b9d242d1638201a5d2511d68f45f32f2999b9 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 45d40fe6b077af3d530dc3718964fef44f63d717..96d8713da1a40b201153b9d9ddf167a4d4b82b44 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 b4bb5d58bb83f34693667d6e6c1ff2a75046fb41..491e8a0ce54a623649463842830ecbc5055dfaaf 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 1afd652c8d769655195d352a580a25b4a6af6e6a..37b8ad1aa7c8fb044cba76ed855bf28a72b7ee76 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 a8cdfc58ee43ed3fed8225983a6e09a365cf7238..4093316aca12a8c3a70ca1d138fcfb5d508f60ba 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 e830fb49e01cf7857eb676b87c73d830257c41fb..adaf644e9a7325860d862afbff59f1bf31d19f1c 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 8d828de322ae139e5c977b636e6e0750ac7be579..aa1d628ee5c175a8e4746ac41390df2ebb8db4fe 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 d679cc479a0c64722e5a60f482a9b1808b10eab5..5fa4fb5a5d9c0178d5bf4f14a2feb993112960e4 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 12c94af36d116ab517f02005c3375e754c558cc0..d8a7cf0a3581d74be864014c3691a5af0c3168e9 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 7d89ae63ec3c9428300fbffd7b0bd4d2241375c1..c0ab6b0a2621811636e56bd4cf98d1f8a3065d11 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 cfd9428fe68141fdfe5b2af742e8453b02dbb209..3bd59f394e331b774041ec9e56dcf3e6287ce961 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 93939c53112ccbb750bf11f98c5a5aaff25050a9..d976a231f844e35dc31b4bd8f0fab58e555a1e68 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 6afb1ab49dd4db23bf157c446775684bb3d318ca..c5f66555b5789c6ad3e3fec9bc7ab3c9c64aa073 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 21d11f0dbe1b8b701790b79b1e7c6e752ff8ebf1..bebe89cc77e2c1ea41b1816aadf6fe120f560497 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 9e6ca1c2e2e596784ade277e5bea8fdcde85092d..becb0a9ff4574e7cc01bea7cd7c1e2b66703687a 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 37f4044ac287fccc1cd8b861b417334017586733..1b5c12aca5994108aacb4c9de580acaec45e6450 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 7fa3039996a95985596dca0a861d509d28bab279..fe4a3c6e8f3610cc22ac79f46d8655e6e7f3b511 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 694af1d9d660db739551e5fa01fb8a0c249028d9..f4764aebaee2c5d8ea9c96133f5bea65b50c416c 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 5b6f80b6df9fe88a21d24746b9a517af8066bac3..2e5d111b9c56e241b1ba5be320ca3a74bd1232ff 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 6e8bed95c89f79fc1bca222188cb44d501a24a66..9fbc0382c6c60c4da479866e4bac6509a742251a 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 d46ed700dbbd899dda5214aec1160133db4ba581..a555be2a1ed02035dd71503ca317dee75a03d457 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 ba39d2a9d5ceaf127f3487957ab5daa8cc30a640..bbc1637449ed9bdab6021fc5813b6512d2c96260 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 dfcdd7e78a0f2a7a7ea5059ec4976a987a06b1fa..0469fba17bd3685f48934d61aa5df7f16ac0c6d1 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 9e2a216bc17472cba121652ba17e0fe028f8319b..39801e164f8f6546ff0ae24242eaec569a50809b 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 99a71f2a642b671c622374123bef8a69017e54cb..8c26c693d48d3f0950d1fe22b377d9c9799f0fbf 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 48f1db3bd573f19f7f40a96116b535e73fba8c81..309aa1dd2d41eae6baead8b69b72782e5e01c2c2 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 a3e17ade32e2e7a1b14537afe8ef3caeedefbf38..0138553675ba3d118b0753b214d5f41d6aee1769 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 346bef79b950c296e09a1732951dcf418ae4c9dc..a1ad9c152a22e6f1f4da2d3181f6321f966b492f 100644 --- a/tests/CheckBox.qml +++ b/tests/CheckBox.qml @@ -11,6 +11,10 @@ ApplicationWindow { CheckBox { } + CheckBox { + checked: true + enabled: false + } CheckBox { text: "text"