Add and use ControlColors.tableRow1/2

graphia-app · Oct 10, 2023 · 8e95aca · 8e95aca
1 parent 835e0ab
commit 8e95aca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/source/shared/ui/qml/app/graphia/Shared/Controls/ControlColors.qml b/source/shared/ui/qml/app/graphia/Shared/Controls/ControlColors.qml
@@ -26,4 +26,6 @@ Item
         palette.mid : palette.dark
 
     readonly property color background: palette.active.light
+    readonly property color tableRow1: palette.active.light
+    readonly property color tableRow2: palette.active.button
 }
diff --git a/source/shared/ui/qml/app/graphia/Shared/Controls/DataTable.qml b/source/shared/ui/qml/app/graphia/Shared/Controls/DataTable.qml
@@ -270,7 +270,7 @@ Rectangle
             if(root.highlightedProvider(modelColumn, modelRow))
                 return palette.highlight;
 
-            return modelRow % 2 ? palette.window : palette.alternateBase;
+            return modelRow % 2 ? ControlColors.tableRow1 : ControlColors.tableRow2;
         }
 
         color: palette.buttonText

diff --git a/source/shared/ui/qml/app/graphia/Shared/Controls/NodeAttributeTableView.qml b/source/shared/ui/qml/app/graphia/Shared/Controls/NodeAttributeTableView.qml
@@ -961,7 +961,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.light : palette.midlight;
+                            ctx.fillStyle = i % 2 ? ControlColors.tableRow1 : ControlColors.tableRow2;
                             ctx.fillRect(0, yOffset, width, tableView.rowHeight);
                         }
                     }
@@ -1190,7 +1190,7 @@ Item
                             if(model.subSelected)
                                 return palette.highlight;
 
-                            return model.row % 2 ? palette.light : palette.midlight;
+                            return model.row % 2 ? ControlColors.tableRow1 : ControlColors.tableRow2;
                         }
 
                         // Ripped more or less verbatim from qtquickcontrols/src/controls/Styles/Desktop/TableViewStyle.qml