From 6e9aad291259e7217c0456d74f1bdf7172ef82dd Mon Sep 17 00:00:00 2001 From: accusys Date: Sun, 29 Mar 2026 16:21:06 +0800 Subject: [PATCH] Fix menu bar: height 21px, color #d4d0c8, 4 menus (File Controller Tools Help) --- src/main.rs | 3 +-- ui/main_window.slint | 15 ++++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2591680..d68aa98 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,6 @@ //! RAIDGuard X GUI Client - Main entry point -use slint::ComponentHandle; -use slint::SharedString; +use slint::{ComponentHandle, SharedString}; slint::include_modules!(); diff --git a/ui/main_window.slint b/ui/main_window.slint index 9863dfa..9898461 100644 --- a/ui/main_window.slint +++ b/ui/main_window.slint @@ -100,30 +100,31 @@ export component AppWindow inherits Window { VerticalLayout { spacing: 0; - // Menu Bar - matches Java Swing menu + // Menu Bar - matches Java Swing JMenuBar (height 21) Rectangle { height: 21px; - background: #ece9d8; + background: #d4d0c8; HorizontalLayout { - spacing: 0; + padding: 2px; + spacing: 4px; Text { text: "File"; font_size: 12px; color: #000000; } - Text { width: 12px; } + Text { width: 16px; } Text { text: "Controller"; font_size: 12px; color: #000000; } - Text { width: 12px; } + Text { width: 16px; } Text { text: "Tools"; font_size: 12px; color: #000000; } - Text { width: 12px; } + Text { width: 16px; } Text { text: "Help"; font_size: 12px; @@ -135,7 +136,7 @@ export component AppWindow inherits Window { // Toolbar - matches Java JToolBar (750x65) Rectangle { height: 65px; - background: #ece9d8; + background: #d4d0c8; HorizontalLayout { spacing: 2px;