sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#270
linuxdeepin · Jan 8, 2024 · f1d3ab5 · f1d3ab5
1 parent 5b1b075
commit f1d3ab5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/qt6/src/qml/ActionButton.qml b/qt6/src/qml/ActionButton.qml
@@ -11,7 +11,7 @@ T.Button {
     id: control
     property D.Palette textColor: DS.Style.button.text
 
-    palette.windowText: pressed ? D.ColorSelector.textColor : undefined
+    palette.windowText: pressed ? D.ColorSelector.textColor : parent ? parent.palette.windowText : undefined
     opacity: D.ColorSelector.controlState === D.DTK.DisabledState ? 0.4 : 1
     implicitWidth: DS.Style.control.implicitWidth(control)
     implicitHeight: DS.Style.control.implicitHeight(control)

diff --git a/qt6/src/qml/ItemDelegate.qml b/qt6/src/qml/ItemDelegate.qml
@@ -35,7 +35,7 @@ T.ItemDelegate {
     spacing: DS.Style.control.spacing
     checkable: true
     autoExclusive: true
-    palette.windowText: checked && !control.cascadeSelected ? D.ColorSelector.checkedTextColor : undefined
+    palette.windowText: checked && !control.cascadeSelected ? D.ColorSelector.checkedTextColor : parent ? parent.palette.windowText : undefined
 
     D.DciIcon.mode: D.ColorSelector.controlState
     D.DciIcon.theme: D.ColorSelector.controlTheme

diff --git a/qt6/src/qml/settings/NavigationTitle.qml b/qt6/src/qml/settings/NavigationTitle.qml
@@ -15,7 +15,7 @@ Control {
     property D.Palette backgroundColor: DS.Style.settings.background
     property D.Palette checkedTextColor: DS.Style.checkedButton.text
 
-    palette.windowText: checked ? D.ColorSelector.checkedTextColor : undefined
+    palette.windowText: checked ? D.ColorSelector.checkedTextColor : parent ? parent.palette.windowText : undefined
     contentItem: Label {
         text: Settings.SettingsGroup.name
         font: __getFont(Settings.SettingsGroup.level)

diff --git a/src/private/dquickcontrolpalette.cpp b/src/private/dquickcontrolpalette.cpp
@@ -11,6 +11,9 @@
 #include <QQuickItem>
 #include <QQuickWindow>
 #include <QDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qquickpalette_p.h>
+#endif
 
 #include <private/qqmlopenmetaobject_p.h>
 #include <private/qqmlglobal_p.h>
@@ -427,6 +430,10 @@ void DQuickControlColorSelector::setControl(QQuickItem *newControl)
     m_control = newControl;
 
     if (m_control) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        auto palette = m_control->property("palette").value<QQuickPalette*>();
+        connect(palette, &QQuickPalette::changed, this, &DQuickControlColorSelector::updateControlTheme);
+#endif
         connect(m_control, SIGNAL(paletteChanged()), this, SLOT(updateControlTheme()));
         connect(m_control, SIGNAL(hoveredChanged()), this, SLOT(updateControlState()));
         if (m_control->metaObject()->indexOfSignal("pressedChanged()") != -1) {