curds/boredos_mirror
1
0
Fork 0
mirror of https://github.com/BoredDevNL/BoredOS.git synced 2026-05-15 18:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

TWEAK: rename TOPBAR --> MENUBAR

Browse source
This commit is contained in:
boreddevnl 2026-04-16 22:11:44 +02:00
parent 049d67e821
commit 7116de4152
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wm/wm.c
View file

@ -95,7 +95,7 @@ static lumos_state_t lumos_state = {0};
static bool lumos_index_built = false; static bool lumos_index_built = false;
static bool force_redraw = true; static bool force_redraw = true;
static bool topbar_dirty_pending = false; static bool menubar_dirty_pending = false;
static void lumos_update_search(void) { static void lumos_update_search(void) {
@ -1634,7 +1634,7 @@ static void wm_paint_region(int y_start, int y_end, DirtyRect dirty, int pass) {
} }
} else if (pass == 2) { } else if (pass == 2) {
if (0 < cy + ch && 30 > cy) { if (0 < cy + ch && 30 > cy) {
draw_rect(0, 0, sw, 30, COLOR_TOPBAR_BG); draw_rect(0, 0, sw, 30, COLOR_MENUBAR_BG);
draw_boredos_logo(8, 8, 1); draw_boredos_logo(8, 8, 1);
draw_clock(sw - 80, 12); draw_clock(sw - 80, 12);
} }
@ -1754,10 +1754,10 @@ void wm_paint(void) {
wm_mark_dirty(mx, my, 12, 12); wm_mark_dirty(mx, my, 12, 12);
DirtyRect dirty = graphics_get_dirty_rect(); DirtyRect dirty = graphics_get_dirty_rect();
if (topbar_dirty_pending) { if (menubar_dirty_pending) {
graphics_mark_dirty(0, 0, sw, 30); graphics_mark_dirty(0, 0, sw, 30);
dirty = graphics_get_dirty_rect(); dirty = graphics_get_dirty_rect();
topbar_dirty_pending = false; menubar_dirty_pending = false;
} }
if (dirty.active) { if (dirty.active) {
int d_h = 60, d_y = sh - d_h - 6, d_total_w = 11 * (48 + 10); int d_h = 60, d_y = sh - d_h - 6, d_total_w = 11 * (48 + 10);
@ -1858,7 +1858,7 @@ void wm_add_window_locked(Window *win) {
all_windows[window_count++] = win; all_windows[window_count++] = win;
wm_bring_to_front_locked(win); // Ensure newly added windows are on top wm_bring_to_front_locked(win); // Ensure newly added windows are on top
wm_mark_dirty(0, 0, get_screen_width(), 30); wm_mark_dirty(0, 0, get_screen_width(), 30);
topbar_dirty_pending = true; menubar_dirty_pending = true;
} }
} }

2
src/wm/wm.h
View file

@ -36,7 +36,7 @@ void wm_lock_release(uint64_t flags);
#define COLOR_DARK_TEXT 0xFFF0F0F0 // Light gray text #define COLOR_DARK_TEXT 0xFFF0F0F0 // Light gray text
#define COLOR_DARK_BORDER 0xFF3A3A3A // Border color #define COLOR_DARK_BORDER 0xFF3A3A3A // Border color
#define COLOR_DOCK_BG 0xFF3A3A3A // Dock background #define COLOR_DOCK_BG 0xFF3A3A3A // Dock background
#define COLOR_TOPBAR_BG 0xFF1A1A1A // Top bar background #define COLOR_MENUBAR_BG 0xFF1A1A1A // Top bar background
#define COLOR_TRAFFIC_RED 0xFFED6158 // Close button red #define COLOR_TRAFFIC_RED 0xFFED6158 // Close button red
#define COLOR_TRAFFIC_YELLOW 0xFFFCC02E // Minimize button (not used for now) #define COLOR_TRAFFIC_YELLOW 0xFFFCC02E // Minimize button (not used for now)
#define COLOR_TRAFFIC_GREEN 0xFF5FC038 // Zoom button (not used for now) #define COLOR_TRAFFIC_GREEN 0xFF5FC038 // Zoom button (not used for now)