From 72cf9d9ae1926dbe3d13451007716f54efd6ef80 Mon Sep 17 00:00:00 2001 From: Phil Hoffmann Date: Mon, 13 Nov 2023 00:39:24 +0100 Subject: [PATCH] Increased contrast for better visibility of ui elements --- app/main.cpp | 2 +- app/ui/Colors.qml | 2 +- app/ui/CustomComponents/CCColors.qml | 3 +- app/ui/CustomComponents/CustomButton.qml | 15 ++--- app/ui/CustomComponents/CustomTextEdit.qml | 2 +- app/ui/Style/Button.qml | 21 ++---- app/ui/Style/CMakeLists.txt | 1 + app/ui/Style/CheckIndicator.qml | 5 +- app/ui/Style/ComboBox.qml | 10 +-- app/ui/Style/ItemDelegate.qml | 17 ++--- app/ui/Style/Menu.qml | 14 ++-- app/ui/Style/MenuItem.qml | 17 ++--- app/ui/Style/ProgressBar.qml | 10 +-- app/ui/Style/RadioIndicator.qml | 5 +- app/ui/Style/ScrollBar.qml | 15 ++--- app/ui/Style/ScrollView.qml | 24 +++++++ app/ui/Style/SpinBox.qml | 23 ++----- app/ui/Style/SplitView.qml | 9 +-- app/ui/Style/StyleColors.qml | 6 +- app/ui/Style/TextField.qml | 16 ++--- app/ui/common/CustomFileDialog.qml | 35 +++++----- app/ui/tools/audio/AudioElementView.qml | 35 +++++----- .../audio/editor/views/EditorFileListView.qml | 64 +++++++------------ app/ui/tools/combat_tracker/ListSpinBox.qml | 13 ++-- app/ui/tools/combat_tracker/ListTextField.qml | 8 +-- app/ui/tools/converter/ConverterUnitPage.qml | 30 ++++----- app/ui/tools/maps/MapMarkerEditor.qml | 5 +- app/ui/tools/settings/PathsPage.qml | 42 ++++++------ app/ui/tools/shop/item_editor/ItemEditor.qml | 2 +- app/ui/tools/shop/shop_editor/ItemList.qml | 2 +- app/ui/tools/shop/shop_editor/ShopInfo.qml | 4 +- app/ui/tools/shop/shop_page/ShopView.qml | 2 +- 32 files changed, 201 insertions(+), 258 deletions(-) create mode 100644 app/ui/Style/ScrollView.qml diff --git a/app/main.cpp b/app/main.cpp index fd7b7ead..6124e1d5 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -75,7 +75,7 @@ void setPalette() palette.setColor(QPalette::ColorRole::AlternateBase, "#343a43"_L1); palette.setColor(QPalette::ColorRole::Window, "#2e2e2e"_L1); palette.setColor(QPalette::ColorRole::WindowText, "#f6f7f8"_L1); - palette.setColor(QPalette::ColorRole::Button, "#3f4957"_L1); + palette.setColor(QPalette::ColorRole::Button, "#8f9aa9"_L1); // 3f4957 palette.setColor(QPalette::ColorRole::ButtonText, "#f6f7f8"_L1); palette.setColor(QPalette::ColorRole::Light, "#ebedef"_L1); palette.setColor(QPalette::ColorRole::Midlight, "#d5dade"_L1); diff --git a/app/ui/Colors.qml b/app/ui/Colors.qml index 0388bab2..acf83f2e 100644 --- a/app/ui/Colors.qml +++ b/app/ui/Colors.qml @@ -1,9 +1,9 @@ pragma Singleton - import QtQuick QtObject { readonly property color border: "#3f4957" readonly property color borderFocus: "#586679" readonly property color menuSeparator: "#A0f1f2f4" + readonly property color buttonPressed: "#737e8c" } diff --git a/app/ui/CustomComponents/CCColors.qml b/app/ui/CustomComponents/CCColors.qml index 855ebf8f..02205230 100644 --- a/app/ui/CustomComponents/CCColors.qml +++ b/app/ui/CustomComponents/CCColors.qml @@ -1,7 +1,8 @@ pragma Singleton - import QtQuick QtObject { readonly property color focus: "#f6f7f8" + readonly property color borderFocus: "#586679" + readonly property color buttonPressed: "#737e8c" } diff --git a/app/ui/CustomComponents/CustomButton.qml b/app/ui/CustomComponents/CustomButton.qml index 54606c81..65269767 100644 --- a/app/ui/CustomComponents/CustomButton.qml +++ b/app/ui/CustomComponents/CustomButton.qml @@ -24,6 +24,7 @@ Control { property color backgroundColor: palette.dark property bool transparentBackground: false property int borderWidth: 1 + property bool forceBorderVisible: false // Layout property bool usesFixedWidth: true @@ -42,10 +43,8 @@ Control { id: main_row spacing: 10 - property int spacingCount: icon_item.visible - && text_item.visible ? 1 : 0 - property int contentWidth: (icon_item.visible ? icon_item.width : 0) - + (text_item.visible ? text_item.width : 0) + spacingCount + property int spacingCount: icon_item.visible && text_item.visible ? 1 : 0 + property int contentWidth: (icon_item.visible ? icon_item.width : 0) + (text_item.visible ? text_item.width : 0) + spacingCount padding: root.centering ? (width - contentWidth) / 2 : 0 @@ -90,8 +89,8 @@ Control { background: Rectangle { visible: !root.transparentBackground color: root.backgroundColor - border.color: palette.button - border.width: mouse_area.containsMouse ? root.borderWidth : 0 + border.color: root.pressed ? CCColors.buttonPressed : palette.button + border.width: mouse_area.containsMouse || root.forceBorderVisible ? root.borderWidth : 0 } ToolTip.text: root.toolTipText @@ -107,9 +106,9 @@ Control { onClicked: function (mouse) { if (mouse.button === Qt.LeftButton) { - root.clicked(root.buttonText) + root.clicked(root.buttonText); } else if (mouse.button === Qt.RightButton) { - root.rightClicked(root.buttonText) + root.rightClicked(root.buttonText); } } } diff --git a/app/ui/CustomComponents/CustomTextEdit.qml b/app/ui/CustomComponents/CustomTextEdit.qml index efb4b7d4..b1d6b34e 100644 --- a/app/ui/CustomComponents/CustomTextEdit.qml +++ b/app/ui/CustomComponents/CustomTextEdit.qml @@ -18,7 +18,7 @@ Rectangle { signal linkClicked(string link) color: palette.dark - border.color: root.enabled ? palette.button : palette.dark + border.color: root.enabled ? (area.activeFocus ? CCColors.borderFocus : palette.button) : palette.dark border.width: root.enabled && area.activeFocus ? 2 : 1 ScrollView { diff --git a/app/ui/Style/Button.qml b/app/ui/Style/Button.qml index 5a6566d7..c8b12f41 100644 --- a/app/ui/Style/Button.qml +++ b/app/ui/Style/Button.qml @@ -4,12 +4,8 @@ import QtQuick.Templates as T T.Button { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max( - background ? background.implicitHeight : 0, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 @@ -17,14 +13,12 @@ T.Button { rightPadding: padding + 2 hoverEnabled: true - font.bold: control.hovered + font.bold: control.enabled && control.hovered contentItem: Text { text: control.text font: control.font - opacity: enabled || control.highlighted || control.checked ? 1 : 0.3 - color: control.checked - || control.highlighted ? StyleColors.focus : (control.visualFocus ? StyleColors.focus : (control.down ? StyleColors.textDisabled : palette.text)) + color: control.enabled ? (control.checked || control.highlighted ? StyleColors.focus : (control.visualFocus ? StyleColors.focus : (control.down ? StyleColors.textDisabled : palette.text))) : StyleColors.textDisabled horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -33,10 +27,9 @@ T.Button { background: Rectangle { implicitWidth: 100 implicitHeight: 40 - visible: !control.flat || control.down || control.checked - || control.highlighted + visible: !control.flat || control.down || control.checked || control.highlighted color: palette.dark - border.color: palette.button - border.width: control.visualFocus || control.hovered ? 1 : 0 + border.color: control.down ? StyleColors.buttonPressed : palette.button + border.width: control.enabled && (control.visualFocus || control.hovered) ? 1 : 0 } } diff --git a/app/ui/Style/CMakeLists.txt b/app/ui/Style/CMakeLists.txt index e4bb5214..76c632bb 100644 --- a/app/ui/Style/CMakeLists.txt +++ b/app/ui/Style/CMakeLists.txt @@ -44,6 +44,7 @@ qt_add_qml_module(gm-companion-ui-style RadioIndicator.qml ScrollBar.qml ScrollIndicator.qml + ScrollView.qml Slider.qml SpinBox.qml SplitView.qml diff --git a/app/ui/Style/CheckIndicator.qml b/app/ui/Style/CheckIndicator.qml index e090415c..c4cb3b5a 100644 --- a/app/ui/Style/CheckIndicator.qml +++ b/app/ui/Style/CheckIndicator.qml @@ -10,10 +10,9 @@ Label { required property int checkState font.pixelSize: control.height > 26 ? 26 : control.height - x: root.control.text ? (root.control.mirrored ? root.control.width - width - root.control.rightPadding : root.control.leftPadding) : root.control.leftPadding - + (root.control.availableWidth - width) / 2 + x: root.control.text ? (root.control.mirrored ? root.control.width - width - root.control.rightPadding : root.control.leftPadding) : root.control.leftPadding + (root.control.availableWidth - width) / 2 y: parent.height / 2 - height / 2 - color: StyleColors.border + color: root.control.down ? StyleColors.buttonPressed : palette.button text: FontAwesome.square font.family: FontAwesome.fontRegular.family diff --git a/app/ui/Style/ComboBox.qml b/app/ui/Style/ComboBox.qml index 83761435..b3680218 100644 --- a/app/ui/Style/ComboBox.qml +++ b/app/ui/Style/ComboBox.qml @@ -56,8 +56,8 @@ T.ComboBox { validator: control.validator font: control.font - color: !control.editable && control.visualFocus ? StyleColors.focus : palette.text - selectionColor: StyleColors.focus + color: !control.editable && control.visualFocus ? palette.button : palette.text + selectionColor: palette.button selectedTextColor: palette.highlightedText verticalAlignment: Text.AlignVCenter opacity: control.enabled ? 1 : 0.3 @@ -65,7 +65,7 @@ T.ComboBox { background: Rectangle { visible: control.editable && !control.flat border.width: parent && parent.activeFocus ? 2 : 1 - border.color: parent && parent.activeFocus ? StyleColors.focus : StyleColors.border + border.color: palette.button implicitHeight: 40 } } @@ -75,7 +75,7 @@ T.ComboBox { implicitHeight: StyleSizes.comboBoxHeight color: palette.dark - border.color: StyleColors.border + border.color: control.down ? StyleColors.buttonPressed : palette.button border.width: 1 } @@ -138,7 +138,7 @@ T.ComboBox { width: parent.width height: parent.height color: "transparent" - border.color: StyleColors.border + border.color: palette.button } T.ScrollIndicator.vertical: ScrollIndicator { diff --git a/app/ui/Style/ItemDelegate.qml b/app/ui/Style/ItemDelegate.qml index b68d5b75..53c9f0bb 100644 --- a/app/ui/Style/ItemDelegate.qml +++ b/app/ui/Style/ItemDelegate.qml @@ -5,13 +5,8 @@ import QtQuick.Templates as T T.ItemDelegate { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max( - background ? background.implicitHeight : 0, Math.max( - contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 @@ -21,10 +16,8 @@ T.ItemDelegate { font.pointSize: 12 contentItem: Label { - leftPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) - + control.spacing : 0 - rightPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) - + control.spacing : 0 + leftPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + rightPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 text: control.text font: control.font @@ -39,7 +32,7 @@ T.ItemDelegate { implicitHeight: StyleSizes.delegateHeight visible: control.down || control.highlighted || control.visualFocus color: palette.dark - border.color: StyleColors.border + border.color: control.down ? StyleColors.buttonPressed : palette.button border.width: control.hovered ? 1 : 0 } } diff --git a/app/ui/Style/Menu.qml b/app/ui/Style/Menu.qml index 1be1a801..a010c11d 100644 --- a/app/ui/Style/Menu.qml +++ b/app/ui/Style/Menu.qml @@ -5,12 +5,8 @@ import QtQuick.Templates as T T.Menu { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - implicitHeight: Math.max( - background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 transformOrigin: Item.Top @@ -55,13 +51,13 @@ T.Menu { implicitHeight: contentHeight model: control.contentModel - interactive: ApplicationWindow.window ? contentHeight - > ApplicationWindow.window.height : false + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false clip: true keyNavigationWraps: false currentIndex: -1 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollIndicator.vertical: ScrollIndicator { + } } background: Rectangle { diff --git a/app/ui/Style/MenuItem.qml b/app/ui/Style/MenuItem.qml index 5151e2d1..9c975cf6 100644 --- a/app/ui/Style/MenuItem.qml +++ b/app/ui/Style/MenuItem.qml @@ -5,23 +5,16 @@ import QtQuick.Templates as T T.MenuItem { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max( - background ? background.implicitHeight : 0, Math.max( - contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 hoverEnabled: true contentItem: Label { - leftPadding: control.checkable - && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.checkable - && control.mirrored ? control.indicator.width + control.spacing : 0 + leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font @@ -39,7 +32,7 @@ T.MenuItem { height: parent.height - 2 color: "transparent" opacity: enabled ? 1 : 0.3 - border.color: StyleColors.border + border.color: control.down ? StyleColors.buttonPressed : palette.button border.width: control.hovered ? 1 : 0 } } diff --git a/app/ui/Style/ProgressBar.qml b/app/ui/Style/ProgressBar.qml index e82c7025..d06c4306 100644 --- a/app/ui/Style/ProgressBar.qml +++ b/app/ui/Style/ProgressBar.qml @@ -4,12 +4,8 @@ import QtQuick.Templates as T T.ProgressBar { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max( - background ? background.implicitHeight : 0, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) contentItem: Item { implicitHeight: StyleSizes.progressBarHeight @@ -35,7 +31,7 @@ T.ProgressBar { height: StyleSizes.progressBarHeight color: palette.window - border.color: StyleColors.border + border.color: palette.button border.width: 1 } } diff --git a/app/ui/Style/RadioIndicator.qml b/app/ui/Style/RadioIndicator.qml index 00c1ddc4..d95ed387 100644 --- a/app/ui/Style/RadioIndicator.qml +++ b/app/ui/Style/RadioIndicator.qml @@ -9,10 +9,9 @@ Label { property T.RadioButton control font.pixelSize: 26 - x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding - + (control.availableWidth - width) / 2 + x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: parent.height / 2 - height / 2 - color: StyleColors.border + color: control.down ? StyleColors.buttonPressed : palette.button text: FontAwesome.circle font.family: FontAwesome.fontRegular.family diff --git a/app/ui/Style/ScrollBar.qml b/app/ui/Style/ScrollBar.qml index b61d271c..b121f6b2 100644 --- a/app/ui/Style/ScrollBar.qml +++ b/app/ui/Style/ScrollBar.qml @@ -4,12 +4,8 @@ import QtQuick.Templates as T T.ScrollBar { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max( - background ? background.implicitHeight : 0, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) padding: 2 visible: policy !== T.ScrollBar.AlwaysOff @@ -19,15 +15,12 @@ T.ScrollBar { implicitHeight: control.interactive ? 6 : 2 radius: width / 2 - color: control.pressed ? palette.dark : palette.button - border.color: StyleColors.border - border.width: control.pressed ? 1 : 0 + color: control.pressed ? StyleColors.buttonPressed : palette.button opacity: control.size < 1.0 ? 0.5 : 0.0 states: State { name: "active" - when: control.policy === T.ScrollBar.AlwaysOn - || (control.active && control.size < 1.0) + when: control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0) PropertyChanges { control.contentItem.opacity: 0.75 diff --git a/app/ui/Style/ScrollView.qml b/app/ui/Style/ScrollView.qml new file mode 100644 index 00000000..323b689d --- /dev/null +++ b/app/ui/Style/ScrollView.qml @@ -0,0 +1,24 @@ +import QtQuick.Templates as T + +T.ScrollView { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) + + ScrollBar.vertical: ScrollBar { + parent: control + x: control.mirrored ? 0 : control.width - width + y: control.topPadding + height: control.availableHeight + active: control.ScrollBar.horizontal.active + } + + ScrollBar.horizontal: ScrollBar { + parent: control + x: control.leftPadding + y: control.height - height + width: control.availableWidth + active: control.ScrollBar.vertical.active + } +} diff --git a/app/ui/Style/SpinBox.qml b/app/ui/Style/SpinBox.qml index db46030d..c1ca891a 100644 --- a/app/ui/Style/SpinBox.qml +++ b/app/ui/Style/SpinBox.qml @@ -5,16 +5,8 @@ import IconFonts T.SpinBox { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - contentItem.implicitWidth + 2 * padding - + (up.indicator ? up.indicator.implicitWidth : 0) - + (down.indicator ? down.indicator.implicitWidth : 0)) - implicitHeight: Math.max( - contentItem.implicitHeight + topPadding + bottomPadding, - background ? background.implicitHeight : 0, - up.indicator ? up.indicator.implicitHeight : 0, - down.indicator ? down.indicator.implicitHeight : 0) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + 2 * padding + (up.indicator ? up.indicator.implicitWidth : 0) + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, background ? background.implicitHeight : 0, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 @@ -49,11 +41,10 @@ T.SpinBox { Rectangle { x: -6 - (control.down.indicator ? 1 : 0) y: -6 - width: control.width - (control.up.indicator ? control.up.indicator.width - 1 : 0) - - (control.down.indicator ? control.down.indicator.width - 1 : 0) + width: control.width - (control.up.indicator ? control.up.indicator.width - 1 : 0) - (control.down.indicator ? control.down.indicator.width - 1 : 0) height: control.height color: "transparent" - border.color: control.activeFocus ? StyleColors.borderFocus : StyleColors.border + border.color: control.activeFocus ? StyleColors.borderFocus : palette.button border.width: control.activeFocus ? 2 : 1 } } @@ -64,7 +55,7 @@ T.SpinBox { implicitWidth: height implicitHeight: StyleSizes.spinBoxHeight color: palette.dark - border.color: StyleColors.border + border.color: control.up.pressed ? StyleColors.buttonPressed : palette.button border.width: control.up.hovered ? 1 : 0 Label { @@ -82,7 +73,7 @@ T.SpinBox { implicitWidth: height implicitHeight: StyleSizes.spinBoxHeight color: palette.dark - border.color: StyleColors.border + border.color: control.down.pressed ? StyleColors.buttonPressed : palette.button border.width: control.down.hovered ? 1 : 0 Label { @@ -96,6 +87,6 @@ T.SpinBox { background: Rectangle { implicitWidth: 140 color: "transparent" - border.color: StyleColors.border + border.color: palette.button } } diff --git a/app/ui/Style/SplitView.qml b/app/ui/Style/SplitView.qml index 5ffa5cdc..39c543c3 100644 --- a/app/ui/Style/SplitView.qml +++ b/app/ui/Style/SplitView.qml @@ -1,5 +1,4 @@ pragma ComponentBehavior: Bound - import QtQuick import QtQuick.Templates as T import QtQuick.Controls @@ -7,10 +6,8 @@ import QtQuick.Controls.impl T.SplitView { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) hoverEnabled: true @@ -18,7 +15,7 @@ T.SplitView { implicitWidth: control.orientation === Qt.Horizontal ? 1 : control.width implicitHeight: control.orientation === Qt.Horizontal ? control.height : 1 - color: T.SplitHandle.pressed ? StyleColors.splitViewHandlePressed : (T.SplitHandle.hovered ? StyleColors.splitViewHandleHighlight : StyleColors.splitViewHandle) + color: T.SplitHandle.pressed ? StyleColors.buttonPressed : (T.SplitHandle.hovered ? palette.button : StyleColors.splitViewHandle) containmentMask: Item { x: -width / 2 diff --git a/app/ui/Style/StyleColors.qml b/app/ui/Style/StyleColors.qml index 277650f2..3f9ab5f4 100644 --- a/app/ui/Style/StyleColors.qml +++ b/app/ui/Style/StyleColors.qml @@ -1,16 +1,14 @@ pragma Singleton - import QtQuick QtObject { readonly property color focus: "#f6f7f8" - readonly property color textDisabled: "#A0f1f2f4" + readonly property color textDisabled: "#9c9d9e" readonly property color dim: "#A01f1f1f" readonly property color border: "#3f4957" readonly property color borderFocus: "#586679" readonly property color menuSeparator: "#A0f1f2f4" readonly property color pageIndicator: "#343a43" readonly property color splitViewHandle: "#3f4957" - readonly property color splitViewHandleHighlight: "#586679" - readonly property color splitViewHandlePressed: "#313843" + readonly property color buttonPressed: "#737e8c" } diff --git a/app/ui/Style/TextField.qml b/app/ui/Style/TextField.qml index 11efe455..1bc90e53 100644 --- a/app/ui/Style/TextField.qml +++ b/app/ui/Style/TextField.qml @@ -6,14 +6,8 @@ import QtQuick.Templates as T T.TextField { id: control - implicitWidth: Math.max( - background ? background.implicitWidth : 0, - placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) - || contentWidth + leftPadding + rightPadding - implicitHeight: Math.max( - contentHeight + topPadding + bottomPadding, - background ? background.implicitHeight : 0, - placeholder.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 leftPadding: padding + 4 @@ -35,9 +29,7 @@ T.TextField { color: enabled ? palette.text : StyleColors.textDisabled opacity: 0.7 verticalAlignment: control.verticalAlignment - visible: !control.length && !control.preeditText - && (!control.activeFocus - || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight } @@ -46,6 +38,6 @@ T.TextField { implicitHeight: StyleSizes.textFieldHeight border.width: control.activeFocus ? 2 : 1 color: palette.window - border.color: control.activeFocus ? StyleColors.borderFocus : (control.enabled ? StyleColors.border : palette.dark) + border.color: control.activeFocus ? StyleColors.borderFocus : (control.enabled ? palette.button : palette.dark) } } diff --git a/app/ui/common/CustomFileDialog.qml b/app/ui/common/CustomFileDialog.qml index 9d028302..73b97584 100644 --- a/app/ui/common/CustomFileDialog.qml +++ b/app/ui/common/CustomFileDialog.qml @@ -1,5 +1,4 @@ pragma ComponentBehavior: Bound - import QtQuick import QtQuick.Controls import CustomComponents @@ -31,14 +30,12 @@ Dialog { onAccepted: { if (textField) { if (replacePath) { - textField.text = selection_text_field.text.replace(replacePath, - "") + textField.text = selection_text_field.text.replace(replacePath, ""); } else { - textField.text = selection_text_field.text + textField.text = selection_text_field.text; } - if (textField.savePath) { - textField.savePath() + textField.savePath(); } } } @@ -86,7 +83,7 @@ Dialog { iconText: FontAwesome.folderPlus onClicked: { - new_folder_form.visible = !new_folder_form.visible + new_folder_form.visible = !new_folder_form.visible; } } } @@ -125,11 +122,10 @@ Dialog { onEditingFinished: { if (text.length > 0) { - backend.createFolder(text) + backend.createFolder(text); } - - new_folder_form.visible = false - clear() + new_folder_form.visible = false; + clear(); } } } @@ -152,12 +148,12 @@ Dialog { } onCurrentIndexChanged: { - selection_text_field.text = backend.getSelected(currentIndex) + selection_text_field.text = backend.getSelected(currentIndex); } model: backend.entries - delegate: Item { + delegate: Rectangle { id: delegate_item required property int index @@ -165,9 +161,14 @@ Dialog { anchors.left: parent ? parent.left : undefined anchors.right: parent ? parent.right : undefined + anchors.leftMargin: 1 anchors.rightMargin: scroll_bar.visible ? scroll_bar.width : 0 height: delegate_row.height + color: "transparent" + border.color: delegate_mouse_area.pressed ? Colors.buttonPressed : palette.button + border.width: delegate_mouse_area.containsMouse ? 1 : 0 + Row { id: delegate_row anchors.left: parent.left @@ -235,11 +236,10 @@ Dialog { anchors.top: parent.top anchors.bottom: parent.bottom - width: Math.max(open_button.implicitWidth, - cancel_button.implicitWidth) + width: Math.max(open_button.implicitWidth, cancel_button.implicitWidth) onClicked: { - root.accept() + root.accept(); } } @@ -249,8 +249,7 @@ Dialog { anchors.top: parent.top anchors.bottom: parent.bottom - width: Math.max(open_button.implicitWidth, - cancel_button.implicitWidth) + width: Math.max(open_button.implicitWidth, cancel_button.implicitWidth) onClicked: root.close() } diff --git a/app/ui/tools/audio/AudioElementView.qml b/app/ui/tools/audio/AudioElementView.qml index 491e6426..92aa5392 100644 --- a/app/ui/tools/audio/AudioElementView.qml +++ b/app/ui/tools/audio/AudioElementView.qml @@ -20,8 +20,7 @@ Item { Repeater { id: scenario_repeater - model: AudioTool.currentProject && AudioTool.currentProject.currentCategory ? - AudioTool.currentProject.currentCategory.scenarios : [] + model: AudioTool.currentProject && AudioTool.currentProject.currentCategory ? AudioTool.currentProject.currentCategory.scenarios : [] CustomButton { required property AudioScenario modelData @@ -31,9 +30,9 @@ Item { backgroundColor: "transparent" usesFixedWidth: false onClicked: { - var project = AudioTool.currentProject + var project = AudioTool.currentProject; if (project && project.currentCategory) { - project.currentCategory.currentScenario = modelData + project.currentCategory.currentScenario = modelData; } } } @@ -45,8 +44,7 @@ Item { id: list readonly property int min_width: 170 - readonly property int count_per_row: parent ? Math.floor( - width / min_width) : 1 + readonly property int count_per_row: parent ? Math.floor(width / min_width) : 1 readonly property int button_width: (width - verticalScrollBar.width) / count_per_row anchors.top: scenario_flow.bottom @@ -57,8 +55,7 @@ Item { spacing: 10 clip: true - model: (AudioTool.currentProject && AudioTool.currentProject.currentScenario) ? - AudioTool.currentProject.currentScenario.model : [] + model: (AudioTool.currentProject && AudioTool.currentProject.currentScenario) ? AudioTool.currentProject.currentScenario.model : [] ScrollBar.vertical: ScrollBar { id: verticalScrollBar @@ -126,11 +123,11 @@ Item { } // Search - Rectangle { + Item { height: Sizes.toolbarHeight anchors.bottom: parent.bottom anchors.right: parent.right - anchors.margins: 5 + anchors.margins: 10 // Search Button Rectangle { @@ -141,14 +138,17 @@ Item { width: height radius: search_field.visible ? 0 : width / 2 - color: palette.button + color: palette.dark + border.color: palette.button + border.width: 1 Label { font.family: FontAwesome.fontSolid.family font.styleName: FontAwesome.fontSolid.styleName text: search_field.visible ? FontAwesome.xmark : FontAwesome.magnifyingGlass anchors.centerIn: parent - color: search_mouse_area.containsMouse ? "grey" : palette.buttonText + opacity: search_mouse_area.pressed ? 0.5 : search_mouse_area.containsMouse ? 0.75 : 1 + color: palette.buttonText font.pixelSize: parent.height / 2 } @@ -158,11 +158,10 @@ Item { hoverEnabled: true onClicked: { - search_field.visible = !search_field.visible - search_field.clear() - + search_field.visible = !search_field.visible; + search_field.clear(); if (search_field.visible) { - search_field.forceActiveFocus() + search_field.forceActiveFocus(); } } } @@ -191,8 +190,8 @@ Item { Keys.onEscapePressed: { if (search_field.activeFocus) { - search_field.clear() - search_field.visible = false + search_field.clear(); + search_field.visible = false; } } } diff --git a/app/ui/tools/audio/editor/views/EditorFileListView.qml b/app/ui/tools/audio/editor/views/EditorFileListView.qml index 92881b8b..6d3ec37f 100644 --- a/app/ui/tools/audio/editor/views/EditorFileListView.qml +++ b/app/ui/tools/audio/editor/views/EditorFileListView.qml @@ -1,5 +1,4 @@ pragma ComponentBehavior: Bound - import QtQuick import QtQuick.Controls import CustomComponents @@ -18,7 +17,7 @@ Item { foldersOnly: true onAccepted: { - AudioTool.editor.replaceFileFolder(index, selectedPath) + AudioTool.editor.replaceFileFolder(index, selectedPath); } } @@ -57,10 +56,9 @@ Item { // Background Rectangle { anchors.fill: parent - color: delegate_root.modelData - && delegate_root.modelData.missing ? "darkred" : palette.window - border.color: parent.ListView.isCurrentItem ? palette.alternateBase : palette.dark - border.width: parent.ListView.isCurrentItem ? 2 : mouse_area.containsMouse ? 1 : 0 + color: "transparent" + border.color: parent.ListView.isCurrentItem ? palette.button : palette.dark + border.width: parent.ListView.isCurrentItem ? 2 : mouse_area.containsMouse || (delegate_root.modelData && delegate_root.modelData.missing) ? 1 : 0 } // File path label @@ -99,15 +97,14 @@ Item { // Folder CustomToolBarButton { - visible: delegate_root.modelData && delegate_root.modelData.missing - && delegate_root.modelData.source === 0 + visible: delegate_root.modelData && delegate_root.modelData.missing && delegate_root.modelData.source === 0 iconText: FontAwesome.folder toolTipText: qsTr("Select folder for file") onClicked: { - file_dialog.index = delegate_root.index - file_dialog.folder = AudioTool.editor.basePath() - file_dialog.open() + file_dialog.index = delegate_root.index; + file_dialog.folder = AudioTool.editor.basePath(); + file_dialog.open(); } } @@ -139,18 +136,11 @@ Item { } onClicked: { - delegate_root.ListView.view.lastIndex - = delegate_root.ListView.view.currentIndex - - AudioTool.editor.moveFile(index, -1) - + delegate_root.ListView.view.lastIndex = delegate_root.ListView.view.currentIndex; + AudioTool.editor.moveFile(index, -1); if (delegate_root.ListView.view.lastIndex > 0) - delegate_root.ListView.view.currentIndex - = delegate_root.ListView.view.lastIndex - 1 - - delegate_root.ListView.view.positionViewAtIndex( - delegate_root.ListView.view.currentIndex, - ListView.Center) + delegate_root.ListView.view.currentIndex = delegate_root.ListView.view.lastIndex - 1; + delegate_root.ListView.view.positionViewAtIndex(delegate_root.ListView.view.currentIndex, ListView.Center); } } @@ -175,18 +165,12 @@ Item { } onClicked: { - delegate_root.ListView.view.lastIndex = delegate_root.index - AudioTool.editor.moveFile(index, 1) - - if (delegate_root.ListView.view.currentIndex - < delegate_root.ListView.view.lastIndex) { - delegate_root.ListView.view.currentIndex - = delegate_root.ListView.view.lastIndex + 1 + delegate_root.ListView.view.lastIndex = delegate_root.index; + AudioTool.editor.moveFile(index, 1); + if (delegate_root.ListView.view.currentIndex < delegate_root.ListView.view.lastIndex) { + delegate_root.ListView.view.currentIndex = delegate_root.ListView.view.lastIndex + 1; } - - delegate_root.ListView.view.positionViewAtIndex( - delegate_root.ListView.view.currentIndex, - ListView.Center) + delegate_root.ListView.view.positionViewAtIndex(delegate_root.ListView.view.currentIndex, ListView.Center); } } } @@ -197,14 +181,12 @@ Item { toolTipText: qsTr("Remove file from list") onClicked: { - var modelLength = AudioTool.editor.files.rowCount() // qmllint disable missing-property - var lastIndex = index < (modelLength - 1) ? index : (modelLength - 2) - - delegate_root.ListView.view.lastIndex = lastIndex - AudioTool.editor.removeFile(index, false) - delegate_root.ListView.view.currentIndex = lastIndex - delegate_root.ListView.view.positionViewAtIndex( - lastIndex, ListView.Contain) + var modelLength = AudioTool.editor.files.rowCount(); // qmllint disable missing-property + var lastIndex = index < (modelLength - 1) ? index : (modelLength - 2); + delegate_root.ListView.view.lastIndex = lastIndex; + AudioTool.editor.removeFile(index, false); + delegate_root.ListView.view.currentIndex = lastIndex; + delegate_root.ListView.view.positionViewAtIndex(lastIndex, ListView.Contain); } } } diff --git a/app/ui/tools/combat_tracker/ListSpinBox.qml b/app/ui/tools/combat_tracker/ListSpinBox.qml index d79623b5..5f70f1aa 100644 --- a/app/ui/tools/combat_tracker/ListSpinBox.qml +++ b/app/ui/tools/combat_tracker/ListSpinBox.qml @@ -1,6 +1,7 @@ import QtQuick import QtQuick.Controls import IconFonts +import "../.." Item { id: root @@ -33,11 +34,11 @@ Item { padding: 0 onClosed: { - root.edit_mode = false + root.edit_mode = false; } onAccepted: { - root.valueEdited(textfield.text) + root.valueEdited(textfield.text); } TextField { @@ -94,7 +95,7 @@ Item { font.family: FontAwesome.fontSolid.family font.styleName: FontAwesome.fontSolid.styleName font.pointSize: 13 - color: left_area.pressed ? "black" : left_area.containsMouse ? "grey" : root.font_color + color: left_area.pressed ? Colors.buttonPressed : left_area.containsMouse ? palette.button : root.font_color anchors.centerIn: parent } @@ -121,7 +122,7 @@ Item { font.family: FontAwesome.fontSolid.family font.styleName: FontAwesome.fontSolid.styleName font.pointSize: 13 - color: right_area.pressed ? "black" : right_area.containsMouse ? "grey" : root.font_color + color: right_area.pressed ? Colors.buttonPressed : right_area.containsMouse ? palette.button : root.font_color anchors.centerIn: parent } @@ -144,8 +145,8 @@ Item { cursorShape: Qt.IBeamCursor onClicked: { - root.edit_mode = true - textfield.forceActiveFocus() + root.edit_mode = true; + textfield.forceActiveFocus(); } } } diff --git a/app/ui/tools/combat_tracker/ListTextField.qml b/app/ui/tools/combat_tracker/ListTextField.qml index 1f0b7de2..190f846b 100644 --- a/app/ui/tools/combat_tracker/ListTextField.qml +++ b/app/ui/tools/combat_tracker/ListTextField.qml @@ -1,6 +1,5 @@ import QtQuick import QtQuick.Controls -import "../.." TextField { property string fieldText: "" @@ -13,13 +12,14 @@ TextField { text: fieldText onTextEdited: { - fieldText = text + fieldText = text; } - background: Item {} + background: Item { + } Rectangle { - color: Colors.border + color: palette.button height: 1 anchors.left: parent.left anchors.right: parent.right diff --git a/app/ui/tools/converter/ConverterUnitPage.qml b/app/ui/tools/converter/ConverterUnitPage.qml index 6a6ae589..265fe58d 100644 --- a/app/ui/tools/converter/ConverterUnitPage.qml +++ b/app/ui/tools/converter/ConverterUnitPage.qml @@ -1,5 +1,4 @@ pragma ComponentBehavior: Bound - import QtQuick import QtQuick.Controls import IconFonts @@ -12,7 +11,7 @@ Page { id: page Component.onCompleted: { - from_value_text_field.forceActiveFocus() + from_value_text_field.forceActiveFocus(); } Item { @@ -71,8 +70,7 @@ Page { id: left_column spacing: 10 - width: left_scroll_bar.visible ? parent.width - left_scroll_bar.width - - 5 : parent.width + width: left_scroll_bar.visible ? parent.width - left_scroll_bar.width - 5 : parent.width Repeater { id: from_unit_repeater @@ -88,10 +86,12 @@ Page { hoverEnabled: true font.pointSize: 12 - backgroundColor: ConverterTool.fromUnit === modelData ? palette.button : palette.dark + forceBorderVisible: ConverterTool.fromUnit === modelData + borderWidth: forceBorderVisible ? 2 : 1 + backgroundColor: palette.dark onClicked: { - ConverterTool.fromUnit = modelData + ConverterTool.fromUnit = modelData; } } } @@ -138,11 +138,7 @@ Page { height: Sizes.toolbarHeight * 1.5 font.pointSize: 12 readOnly: true - text: ConverterTool.convert( - ConverterTool.fromUnit, - from_value_text_field.text, - ConverterTool.toUnit) - + text: ConverterTool.convert(ConverterTool.fromUnit, from_value_text_field.text, ConverterTool.toUnit) } Flickable { @@ -168,8 +164,7 @@ Page { id: right_column spacing: 10 - width: right_scroll_bar.visible ? parent.width - right_scroll_bar.width - - 5 : parent.width + width: right_scroll_bar.visible ? parent.width - right_scroll_bar.width - 5 : parent.width Repeater { id: to_unit_repeater @@ -180,17 +175,18 @@ Page { required property ConverterUnit modelData property string converted: ConverterTool.convert(ConverterTool.fromUnit, from_value_text_field.text, modelData) - buttonText: qsTranslate("Units", modelData.name) - + (converted.length > 0 ? " (" + converted + ")" : "") + buttonText: qsTranslate("Units", modelData.name) + (converted.length > 0 ? " (" + converted + ")" : "") anchors.left: parent ? parent.left : undefined anchors.right: parent ? parent.right : undefined hoverEnabled: true font.pointSize: 12 - backgroundColor: ConverterTool.toUnit === modelData ? palette.button : palette.dark + forceBorderVisible: ConverterTool.toUnit === modelData + borderWidth: forceBorderVisible ? 2 : 1 + backgroundColor: palette.dark onClicked: { - ConverterTool.toUnit = modelData + ConverterTool.toUnit = modelData; } } } diff --git a/app/ui/tools/maps/MapMarkerEditor.qml b/app/ui/tools/maps/MapMarkerEditor.qml index 8b175ee4..9ae75948 100644 --- a/app/ui/tools/maps/MapMarkerEditor.qml +++ b/app/ui/tools/maps/MapMarkerEditor.qml @@ -4,6 +4,7 @@ import QtQuick.Controls import CustomComponents import IconFonts import src +import "../.." Dialog { id: root @@ -112,7 +113,7 @@ Dialog { color: "transparent" border.width: icon_mouse_area.containsMouse ? 2 : 0 - border.color: palette.button + border.color: icon_mouse_area.pressed ? Colors.buttonPressed : palette.button MouseArea { id: icon_mouse_area @@ -167,7 +168,7 @@ Dialog { color: modelData border.width: color_mouse_area.containsMouse ? 2 : 0 - border.color: palette.button + border.color: color_mouse_area.pressed ? Colors.buttonPressed : palette.button MouseArea { id: color_mouse_area diff --git a/app/ui/tools/settings/PathsPage.qml b/app/ui/tools/settings/PathsPage.qml index c4374b43..999a61c6 100644 --- a/app/ui/tools/settings/PathsPage.qml +++ b/app/ui/tools/settings/PathsPage.qml @@ -53,19 +53,20 @@ Item { anchors.margins: 5 Repeater { -// { -// "name": "GoogleDrive", -// "setting": "GoogleDrive", -// "icon": FontAwesome.googleDrive, -// "iconFont": FontAwesome.fontBrands -// }, + + // { + // "name": "GoogleDrive", + // "setting": "GoogleDrive", + // "icon": FontAwesome.googleDrive, + // "iconFont": FontAwesome.fontBrands + // }, model: [{ "name": "Local", "setting": "local", "icon": FontAwesome.hardDrive, "iconFont": FontAwesome.fontSolid - }, { + }, { "name": "NextCloud", "setting": "NextCloud", "icon": FontAwesome.cloud, @@ -82,8 +83,8 @@ Item { onClicked: { if (checked) { - SettingsManager.cloudMode = modelData.setting - fileModeChanged() + SettingsManager.cloudMode = modelData.setting; + fileModeChanged(); } } } @@ -96,7 +97,6 @@ Item { anchors.bottom: parent.bottom anchors.left: type_list.right anchors.right: parent.right - anchors.margins: 10 clip: true contentWidth: -1 @@ -109,10 +109,11 @@ Item { Column { id: main_column + anchors.margins: 10 anchors.left: parent.left anchors.right: parent.right - anchors.rightMargin: scroll_bar.visible ? scroll_bar.width + 5 : 0 - + anchors.rightMargin: scroll_bar.visible ? scroll_bar.width + 5 : 10 + topPadding: 10 spacing: 5 Repeater { @@ -143,12 +144,11 @@ Item { anchors.rightMargin: 5 function loadPath() { - text = SettingsManager.getPath( - path_box.modelData.setting) + text = SettingsManager.getPath(path_box.modelData.setting); } function savePath() { - SettingsManager.setPath(path_box.modelData.setting, text) + SettingsManager.setPath(path_box.modelData.setting, text); } Component.onCompleted: loadPath() @@ -158,7 +158,7 @@ Item { target: root function onFileModeChanged() { - path_text_field.loadPath() + path_text_field.loadPath(); } } } @@ -172,11 +172,11 @@ Item { centering: true onClicked: { - root.fileDialog.title = path_box.modelData.name - root.fileDialog.foldersOnly = true - root.fileDialog.folder = path_text_field.text - root.fileDialog.textField = path_text_field - root.fileDialog.open() + root.fileDialog.title = path_box.modelData.name; + root.fileDialog.foldersOnly = true; + root.fileDialog.folder = path_text_field.text; + root.fileDialog.textField = path_text_field; + root.fileDialog.open(); } } } diff --git a/app/ui/tools/shop/item_editor/ItemEditor.qml b/app/ui/tools/shop/item_editor/ItemEditor.qml index 3ec4d941..7c54a20f 100644 --- a/app/ui/tools/shop/item_editor/ItemEditor.qml +++ b/app/ui/tools/shop/item_editor/ItemEditor.qml @@ -59,7 +59,7 @@ Page { anchors.margins: 5 height: Sizes.toolbarHeight - color: palette.button + color: palette.alternateBase Row { anchors.fill: parent diff --git a/app/ui/tools/shop/shop_editor/ItemList.qml b/app/ui/tools/shop/shop_editor/ItemList.qml index ac87f597..ab863823 100644 --- a/app/ui/tools/shop/shop_editor/ItemList.qml +++ b/app/ui/tools/shop/shop_editor/ItemList.qml @@ -11,7 +11,7 @@ Page { header: Rectangle { height: Sizes.toolbarHeight - color: palette.button + color: palette.alternateBase Label { text: qsTr("Item") diff --git a/app/ui/tools/shop/shop_editor/ShopInfo.qml b/app/ui/tools/shop/shop_editor/ShopInfo.qml index f9134ca2..2158d682 100644 --- a/app/ui/tools/shop/shop_editor/ShopInfo.qml +++ b/app/ui/tools/shop/shop_editor/ShopInfo.qml @@ -132,7 +132,7 @@ Column { width: height background: Rectangle { - color: palette.button + color: palette.alternateBase } Text { @@ -282,7 +282,7 @@ Column { anchors.margins: 5 height: Sizes.toolbarHeight - color: palette.button + color: palette.alternateBase Row { anchors.fill: parent diff --git a/app/ui/tools/shop/shop_page/ShopView.qml b/app/ui/tools/shop/shop_page/ShopView.qml index f9139d06..8b6faccd 100644 --- a/app/ui/tools/shop/shop_page/ShopView.qml +++ b/app/ui/tools/shop/shop_page/ShopView.qml @@ -61,7 +61,7 @@ Page { anchors.right: parent.right anchors.top: parent.top height: Sizes.toolbarHeight - 10 - color: palette.button + color: palette.alternateBase Row { anchors.fill: parent