From b9eee50e52f98d0c94e04f3712ca36cb721c8af6 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sun, 1 Feb 2026 18:40:00 -0500 Subject: [PATCH] Fix menu bar colors. --- qml/ClideMenuBar.qml | 19 +++++++++---------- qml/main.qml | 8 +------- src/gui/colors.rs | 2 +- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/qml/ClideMenuBar.qml b/qml/ClideMenuBar.qml index 3201f8d..0675623 100644 --- a/qml/ClideMenuBar.qml +++ b/qml/ClideMenuBar.qml @@ -8,10 +8,16 @@ import QtQuick.Controls import clide.module 1.0 MenuBar { + // Background for this MenuBar. + background: Rectangle { + color: RustColors.menubar + border.color: RustColors.explorer_background + } + // Base settings for each Menu. component ClideMenu : Menu { background: Rectangle { - color: RustColors.menubar + color: RustColors.explorer_background implicitWidth: 100 radius: 2 } @@ -23,7 +29,7 @@ MenuBar { background: Rectangle { color: root.hovered ? RustColors.hovered : RustColors.unhovered - radius: 2.5 + radius: 1.0 } contentItem: IconLabel { color: "black" @@ -32,13 +38,6 @@ MenuBar { } } - // Background for this MenuBar. - background: Rectangle { - color: RustColors.menubar - border.color: RustColors.menubar_border - } - - // // File Menu Action { @@ -79,7 +78,7 @@ MenuBar { MenuSeparator { background: Rectangle { border.color: color - color: RustColors.menubar_border + color: RustColors.explorer_background implicitHeight: 3 implicitWidth: 200 } diff --git a/qml/main.qml b/qml/main.qml index 28271a1..85200b3 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -19,13 +19,7 @@ ApplicationWindow { required property string appContextPath - menuBar: ClideMenuBar { - } - - Rectangle { - anchors.fill: parent - color: RustColors.gutter - } + menuBar: ClideMenuBar { } MessageDialog { id: errorDialog diff --git a/src/gui/colors.rs b/src/gui/colors.rs index 33ed86b..a413442 100644 --- a/src/gui/colors.rs +++ b/src/gui/colors.rs @@ -75,7 +75,7 @@ impl Default for RustColorsImpl { hovered: QColor::try_from("#303234").unwrap(), unhovered: QColor::try_from("#3c3f41").unwrap(), pressed: QColor::try_from("#4b4f51").unwrap(), - menubar: QColor::try_from("#3c3f41").unwrap(), + menubar: QColor::try_from("#262626").unwrap(), menubar_border: QColor::try_from("#575757").unwrap(), scrollbar: QColor::try_from("#4b4f51").unwrap(), scrollbar_active: QColor::try_from("#4b4f51").unwrap(),