chore: keep consistent highlight color in different themes

don't inverse color when color type is highlight Log: keep consistent highlight color in dark/light themes
FeiWang1119 · Mar 22, 2024 · d24dfe8 · d24dfe8
1 parent 74e0716
commit d24dfe8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/private/dqmlglobalobject.cpp b/src/private/dqmlglobalobject.cpp
@@ -50,6 +50,11 @@ bool DColor::isTypedColor() const noexcept
     return data.color.type >= VARIANT_COLOR_TYPE_OFFSET;
 }
 
+quint8 DColor::type() const noexcept
+{
+    return data.color.type;
+}
+
 static inline QPalette::ColorRole toPaletteColorRole(quint8 type)
 {
     auto color = static_cast<DColor::Type>(type - VARIANT_COLOR_TYPE_OFFSET);

diff --git a/src/private/dqmlglobalobject_p.h b/src/private/dqmlglobalobject_p.h
@@ -63,6 +63,7 @@ class DColor
 
     [[nodiscard]] bool isValid() const noexcept;
     [[nodiscard]] bool isTypedColor() const noexcept;
+    [[nodiscard]] quint8 type() const noexcept;
 
     bool operator==(const DColor &c) const noexcept;
     bool operator!=(const DColor &c) const noexcept;

diff --git a/src/private/dquickcontrolpalette.cpp b/src/private/dquickcontrolpalette.cpp
@@ -783,7 +783,9 @@ QColor DQuickControlColorSelector::getColorOf(const DQuickControlPalette *palett
             // create the dark color from the light theme
             targetColor = getColor(palette, DQuickControlPalette::Light, familyIndex, stateIndex);
             // inverse the color to dark
-            shouldInverseColor = true;
+            if (targetColor.type() != DColor::Highlight && targetColor.type() != DColor::HighlightedText) {
+                shouldInverseColor = true;
+            }
         }
     } while (false);