SQUASH, REORDER assorted color tweaks

graphia-app · Oct 6, 2023 · be01d6c · be01d6c
1 parent 15e32a0
commit be01d6c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 19 deletions.
diff --git a/source/app/ui/qml/Find.qml b/source/app/ui/qml/Find.qml
@@ -435,7 +435,7 @@ Rectangle
                             else
                                 return qsTr("Not Found");
                         }
-                        color: palette.mid
+                        color: Qt.platform.os === "osx" ? palette.dark : palette.mid
                     }
 
                     MouseArea

diff --git a/source/app/ui/qml/ManageNamedListDialog.qml b/source/app/ui/qml/ManageNamedListDialog.qml
@@ -76,14 +76,16 @@ Window
                     rightPadding: listBox.scrollBarWidth
                     leftInset: -8
 
-                    property var highlightColor: listBox.highlightedProvider(index) ?
-                        palette.highlight : "transparent"
-
-                    background: Rectangle { color: parent.highlightColor }
+                    background: Rectangle
+                    {
+                        visible: listBox.highlightedProvider(index)
+                        color: palette.highlight
+                    }
 
                     text: modelData
 
-                    color: QmlUtils.contrastingColor(highlightColor)
+                    color: listBox.highlightedProvider(index) ?
+                        palette.highlightedText : palette.windowText
                     elide: Text.ElideRight
                     renderType: Text.NativeRendering
                 }

diff --git a/source/app/ui/qml/Options/OptionsDefaults.qml b/source/app/ui/qml/Options/OptionsDefaults.qml
@@ -177,11 +177,12 @@ Item
             }
         }
 
-        Item
+        Rectangle
         {
             Layout.fillWidth: true
             Layout.fillHeight: true
             visible: root.ambiguityInExtensionsOrPlugins
+            color: palette.light
 
             ScrollView
             {

diff --git a/source/app/ui/qml/app/graphia/Controls/FramedScrollView.qml b/source/app/ui/qml/app/graphia/Controls/FramedScrollView.qml
@@ -21,11 +21,13 @@ import QtQuick.Controls
 
 import app.graphia.Shared.Controls
 
-Item
+Rectangle
 {
     property alias contentChildren: scrollView.contentChildren
     default property alias contentData: scrollView.contentData
 
+    color: palette.light
+
     ScrollView
     {
         id: scrollView

diff --git a/source/app/ui/qml/app/graphia/Controls/ListBox.qml b/source/app/ui/qml/app/graphia/Controls/ListBox.qml
@@ -108,7 +108,7 @@ Rectangle
             model[root.displayRole] : modelData
 
         color: root.highlightedProvider(index) ?
-            palette.highlightedText : palette.windowText
+            palette.highlightedText : palette.text
         elide: Text.ElideRight
         renderType: Text.NativeRendering
     }
@@ -144,7 +144,7 @@ Rectangle
     // Just some semi-sensible defaults
     width: 200
     height: 100
-    color: palette.window
+    color: palette.light
 
     ListView
     {

diff --git a/source/app/ui/qml/app/graphia/Controls/TreeBox.qml b/source/app/ui/qml/app/graphia/Controls/TreeBox.qml
@@ -131,7 +131,7 @@ Item
             Layout.fillWidth: true
             Layout.fillHeight: true
 
-            color: palette.window
+            color: palette.light
 
             TreeView
             {
@@ -415,12 +415,12 @@ Item
                         visible: hasSectionRow
                         font.bold: true
                         font.italic: true
-                        color: palette.windowText
+                        color: palette.text
 
                         text: { return hasSectionRow ? treeView.sectionTextFor(model.row) : ""; }
                     }
 
-                    color: palette.window
+                    color: palette.light
 
                     TreeViewDelegate
                     {
@@ -454,7 +454,7 @@ Item
                             // structure of the delegate implementation, so it could break in future
 
                             let contrastBinding = Qt.binding(() =>
-                                selected ? palette.highlightedText : palette.windowText);
+                                selected ? palette.highlightedText : palette.text);
 
                             if(contentItem instanceof Text)
                             {
@@ -586,7 +586,7 @@ Item
                 anchors.top: parent.top
                 anchors.left: parent.left
 
-                color: palette.window
+                color: palette.light
                 border.width: 1
                 border.color: OutlineColor.scheme
                 radius: 2
@@ -604,7 +604,7 @@ Item
 
                     elide: Text.ElideRight
                     font.italic: true
-                    color: palette.windowText
+                    color: palette.text
 
                     text: root.prettifyFunction(parent.text)
                 }

diff --git a/source/shared/ui/qml/app/graphia/Shared/Controls/NodeAttributeTableView.qml b/source/shared/ui/qml/app/graphia/Shared/Controls/NodeAttributeTableView.qml
@@ -960,7 +960,7 @@ Item
                         for(let i = 0; i < Math.ceil(tableView.height / tableView.rowHeight) + 1; i++)
                         {
                             let yOffset = (i * tableView.rowHeight);
-                            ctx.fillStyle = i % 2 ? palette.window : palette.alternateBase;
+                            ctx.fillStyle = i % 2 ? palette.light : palette.midlight;
                             ctx.fillRect(0, yOffset, width, tableView.rowHeight);
                         }
                     }
@@ -1189,7 +1189,7 @@ Item
                             if(model.subSelected)
                                 return palette.highlight;
 
-                            return model.row % 2 ? palette.window : palette.alternateBase;
+                            return model.row % 2 ? palette.light : palette.midlight;
                         }
 
                         // Ripped more or less verbatim from qtquickcontrols/src/controls/Styles/Desktop/TableViewStyle.qml

diff --git a/source/shared/ui/qml/app/graphia/Shared/Controls/OutlineColor.qml b/source/shared/ui/qml/app/graphia/Shared/Controls/OutlineColor.qml
@@ -22,7 +22,7 @@ import QtQuick
 Item
 {
     readonly property color light: palette.mid
-    readonly property color dark: palette.dark
+    readonly property color dark: Qt.platform.os === "osx" ? palette.mid : palette.dark
     readonly property color scheme: Application.styleHints.colorScheme === Qt.Light ?
         light : dark
 }