Fix theme switching for layers

theCheeseboard · Mar 24, 2024 · 43b8cef · 43b8cef
1 parent bbc6762
commit 43b8cef
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 26 deletions.
diff --git a/controls/com/vicr123/Contemporary/CoreStyles/CMakeLists.txt b/controls/com/vicr123/Contemporary/CoreStyles/CMakeLists.txt
@@ -35,6 +35,7 @@ target_sources(contemporary-corecontrols-plugin PRIVATE
     contemporarystyleplugin.h contemporarystyleplugin.cpp
     contemporarystyle.cpp contemporarystyle.h
     contemporaryinitialisation.h contemporaryinitialisation.cpp
+    layercalculator.h layercalculator.cpp
 )
 
 qt_add_resources(contemporary-corecontrols-plugin libcontemporary-qml-corestyles

diff --git a/controls/com/vicr123/Contemporary/CoreStyles/contemporarystyle.cpp b/controls/com/vicr123/Contemporary/CoreStyles/contemporarystyle.cpp
@@ -1,5 +1,7 @@
 #include "contemporarystyle.h"
 
+#include "layercalculator.h"
+
 #include <QColor>
 
 struct ContemporaryStylePrivate {
@@ -149,7 +151,11 @@ QColor ContemporaryStyle::disabled(QColor color)
 {
     if (color.alpha() == 0) return color;
 
-    return QColor::fromHsvF(color.hsvHueF(), color.hsvSaturationF() / 2, color.valueF() / 2);
+    if (color.valueF() < 0.5) {
+        return QColor::fromHsvF(color.hsvHueF(), color.hsvSaturationF() / 2, (1 - color.valueF()) / 2);
+    } else {
+        return QColor::fromHsvF(color.hsvHueF(), color.hsvSaturationF() / 2, color.valueF() / 2);
+    }
 }
 
 QColor ContemporaryStyle::calculateColor(QColor color, bool hovered, bool pressed, bool disabled) {
@@ -159,20 +165,20 @@ QColor ContemporaryStyle::calculateColor(QColor color, bool hovered, bool presse
     return color;
 }
 
-QColor ContemporaryStyle::calculateLayer(uint layer) {
-    return this->calculateLayer(layer, this->background());
+LayerCalculator* ContemporaryStyle::calculateLayer(uint layer) {
+    auto calculator = this->calculateLayer(layer, this->background());
+    connect(this, &ContemporaryStyle::backgroundChanged, calculator, [this, calculator] {
+        calculator->setLayerBase(this->background());
+    });
+    return calculator;
 }
 
-QColor ContemporaryStyle::calculateLayer(uint layer, QColor base) {
-    if (layer <= 0) return base;
-
-    auto layerColor = this->layer();
-    for (auto i = 0; i < layer; i++) {
-        base.setRedF(layerColor.alphaF() * layerColor.redF() + (1 - layerColor.alphaF()) * base.redF());
-        base.setGreenF(layerColor.alphaF() * layerColor.greenF() + (1 - layerColor.alphaF()) * base.greenF());
-        base.setBlueF(layerColor.alphaF() * layerColor.blueF() + (1 - layerColor.alphaF()) * base.blueF());
-    }
-    return base;
+LayerCalculator* ContemporaryStyle::calculateLayer(uint layer, QColor base) {
+    auto calculator = new LayerCalculator(layer, this->layer(), base);
+    connect(this, &ContemporaryStyle::layerChanged, calculator, [this, calculator] {
+        calculator->setLayerColor(this->layer());
+    });
+    return calculator;
 }
 
 void ContemporaryStyle::setColorTheme(ColorTheme colorTheme) {

diff --git a/controls/com/vicr123/Contemporary/CoreStyles/contemporarystyle.h b/controls/com/vicr123/Contemporary/CoreStyles/contemporarystyle.h
@@ -1,8 +1,10 @@
 #ifndef CONTEMPORARYSTYLE_H
 #define CONTEMPORARYSTYLE_H
 
-#include <QObject>
+#include "layercalculator.h"
+
 #include <QColor>
+#include <QObject>
 #include <QtQml>
 
 struct ContemporaryStylePrivate;
@@ -71,8 +73,8 @@ class ContemporaryStyle : public QObject
     Q_INVOKABLE static QColor pressed(QColor color);
     Q_INVOKABLE static QColor disabled(QColor color);
     Q_INVOKABLE QColor calculateColor(QColor color, bool hovered, bool pressed, bool disabled);
-    Q_INVOKABLE QColor calculateLayer(uint layer);
-    Q_INVOKABLE QColor calculateLayer(uint layer, QColor base);
+    Q_INVOKABLE LayerCalculator* calculateLayer(uint layer);
+    Q_INVOKABLE LayerCalculator* calculateLayer(uint layer, QColor base);
     // ReSharper disable once CppRedundantQualifier
     Q_INVOKABLE void setColorTheme(ContemporaryStyle::ColorTheme colorTheme);
 

diff --git a/controls/com/vicr123/Contemporary/CoreStyles/layercalculator.cpp b/controls/com/vicr123/Contemporary/CoreStyles/layercalculator.cpp
@@ -0,0 +1,64 @@
+#include "layercalculator.h"
+
+#include <QColor>
+
+struct LayerCalculatorPrivate {
+    uint layer = 1;
+    QColor layerBase = Qt::transparent;
+    QColor layerColor;
+};
+
+LayerCalculator::LayerCalculator(uint layer, QColor layerColor, QColor layerBase, QObject* parent) :
+    QObject{parent}, d{new LayerCalculatorPrivate} {
+    d->layer = layer;
+    d->layerColor = layerColor;
+    d->layerBase = layerBase;
+}
+
+LayerCalculator::~LayerCalculator() {
+    delete d;
+}
+
+uint LayerCalculator::layer() const {
+    return d->layer;
+}
+
+QColor LayerCalculator::layerBase() const {
+    return d->layerBase;
+}
+
+QColor LayerCalculator::value() const {
+    if (d->layer <= 0) return d->layerBase;
+
+    auto layerColor = this->layerColor();
+    auto base = this->layerBase();
+    for (auto i = 0; i < d->layer; i++) {
+        base.setRedF(layerColor.alphaF() * layerColor.redF() + (1 - layerColor.alphaF()) * base.redF());
+        base.setGreenF(layerColor.alphaF() * layerColor.greenF() + (1 - layerColor.alphaF()) * base.greenF());
+        base.setBlueF(layerColor.alphaF() * layerColor.blueF() + (1 - layerColor.alphaF()) * base.blueF());
+    }
+    return base;
+}
+
+void LayerCalculator::setLayer(uint layer) {
+    d->layer = layer;
+    emit layerChanged();
+    emit valueChanged();
+}
+
+void LayerCalculator::setLayerBase(const QColor& color) {
+    d->layerBase = color;
+    emit layerBaseChanged();
+    emit valueChanged();
+}
+
+QColor LayerCalculator::layerColor() const {
+    return d->layerColor;
+}
+
+void LayerCalculator::setLayerColor(const QColor& color) {
+    d->layerColor = color;
+    emit layerColorChanged();
+    emit valueChanged();
+}
+
diff --git a/controls/com/vicr123/Contemporary/CoreStyles/layercalculator.h b/controls/com/vicr123/Contemporary/CoreStyles/layercalculator.h
@@ -0,0 +1,40 @@
+#ifndef LAYERCALCULATOR_H
+#define LAYERCALCULATOR_H
+
+#include <QObject>
+#include <QColor>
+
+struct LayerCalculatorPrivate;
+class LayerCalculator : public QObject {
+        Q_OBJECT
+        Q_PROPERTY(uint layer READ layer WRITE setLayer NOTIFY layerChanged)
+        Q_PROPERTY(QColor layerBase READ layerBase WRITE setLayerBase NOTIFY layerBaseChanged)
+        Q_PROPERTY(QColor layerColor READ layerColor WRITE setLayerColor NOTIFY layerColorChanged)
+        Q_PROPERTY(QColor value READ value NOTIFY valueChanged)
+
+    public:
+        explicit LayerCalculator(uint layer, QColor layerColor, QColor layerBase = Qt::transparent, QObject* parent = nullptr);
+        ~LayerCalculator();
+
+        uint layer() const;
+        void setLayer(uint layer);
+
+        QColor layerBase() const;
+        void setLayerBase(const QColor& color);
+
+        QColor layerColor() const;
+        void setLayerColor(const QColor& color);
+
+        QColor value() const;
+
+    signals:
+        void layerChanged();
+        void layerBaseChanged();
+        void layerColorChanged();
+        void valueChanged();
+
+    private:
+        LayerCalculatorPrivate* d;
+};
+
+#endif // LAYERCALCULATOR_H
diff --git a/playground/Main.qml b/playground/Main.qml
@@ -152,7 +152,7 @@ ContemporaryWindow {
                     z: 20
 
                     text: qsTr("Extra Surface")
-                    color: Contemporary.calculateLayer(1)
+                    color: Contemporary.calculateLayer(1).value
 
                     backButtonVisible: true
                     onBackButtonClicked: outerStack.pop()

diff --git a/playground/components/Buttons.qml b/playground/components/Buttons.qml
@@ -20,7 +20,7 @@ Control {
 
         z: 10
         text: "Buttons";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     ColumnLayout {

diff --git a/playground/components/CheckboxesRadioButtons.qml b/playground/components/CheckboxesRadioButtons.qml
@@ -18,7 +18,7 @@ Control {
 
         z: 10
         text: "Checkboxes and Radio Buttons";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     RowLayout {

diff --git a/playground/components/ComboBoxPage.qml b/playground/components/ComboBoxPage.qml
@@ -19,7 +19,7 @@ Control {
 
         z: 10
         text: "Combo Box";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     ColumnLayout {

diff --git a/playground/components/Progress.qml b/playground/components/Progress.qml
@@ -18,7 +18,7 @@ Control {
 
         z: 10
         text: "Progress";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     ColumnLayout {

diff --git a/playground/components/Ranges.qml b/playground/components/Ranges.qml
@@ -18,7 +18,7 @@ Control {
 
         z: 10
         text: "Ranges";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     ColumnLayout {

diff --git a/playground/components/Root.qml b/playground/components/Root.qml
@@ -11,7 +11,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.top: parent.top
-        color: Contemporary.calculateLayer(1)
+        color: Contemporary.calculateLayer(1).value
         radius: 4
         width: 300
         z: 10
@@ -22,7 +22,7 @@ Item {
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.top: parent.top
-            color: Contemporary.calculateLayer(2)
+            color: Contemporary.calculateLayer(2).value
             innerTopMargin: SafeZone.top
             text: qsTr("Components")
             z: 10

diff --git a/playground/components/TextInput.qml b/playground/components/TextInput.qml
@@ -18,7 +18,7 @@ Control {
 
         z: 10
         text: "Text Input";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     ColumnLayout {

diff --git a/playground/components/TumblerPage.qml b/playground/components/TumblerPage.qml
@@ -18,7 +18,7 @@ Control {
 
         z: 10
         text: "Tumbler";
-        color: Contemporary.calculateLayer(2)
+        color: Contemporary.calculateLayer(2).value
     }
 
     RowLayout {