diff --git a/brewos.iso b/brewos.iso index 30036f4..53daebe 100644 Binary files a/brewos.iso and b/brewos.iso differ diff --git a/build/brewos.elf b/build/brewos.elf index e665548..347db51 100755 Binary files a/build/brewos.elf and b/build/brewos.elf differ diff --git a/build/control_panel.o b/build/control_panel.o index 577a8e9..d5b895f 100644 Binary files a/build/control_panel.o and b/build/control_panel.o differ diff --git a/iso_root/brewos.elf b/iso_root/brewos.elf index e665548..347db51 100755 Binary files a/iso_root/brewos.elf and b/iso_root/brewos.elf differ diff --git a/src/kernel/cli_apps/about.c b/src/kernel/cli_apps/about.c index ae1bb43..6998bd6 100644 --- a/src/kernel/cli_apps/about.c +++ b/src/kernel/cli_apps/about.c @@ -2,5 +2,5 @@ void cli_cmd_about(char *args) { (void)args; - cli_write("BrewOS Desktop v0.01 Alpha\n"); + cli_write("BrewOS Desktop v1.01 Alpha\n"); } diff --git a/src/kernel/control_panel.c b/src/kernel/control_panel.c index eacf130..c59dd0c 100644 --- a/src/kernel/control_panel.c +++ b/src/kernel/control_panel.c @@ -10,6 +10,7 @@ Window win_control_panel; #define COLOR_GREEN 0xFF008000 #define COLOR_BLUE_BG 0xFF000080 #define COLOR_PURPLE 0xFF800080 +#define COLOR_GREY 0xFF454545 // Control panel state #define VIEW_MAIN 0 @@ -109,6 +110,10 @@ static void control_panel_paint_wallpaper(Window *win) { draw_button(button_x + 100, button_y, 60, 20, "Purple", false); draw_rect(button_x + 165, button_y + 5, 20, 10, COLOR_PURPLE); + // Grey button + draw_button(button_x + 200, button_y, 60, 20, "Grey", false); + draw_rect(button_x + 265, button_y + 5, 20, 10, COLOR_GREY); + // Custom color section button_y += 40; draw_string(offset_x, button_y, "Or something custom", 0xFF000000); @@ -225,6 +230,12 @@ static void control_panel_handle_click(Window *win, int x, int y) { return; } + // Check Grey button + if (x >= button_x + 200 && x < button_x + 260 && y >= button_y && y < button_y + 20) { + graphics_set_bg_color(COLOR_GREY); + return; + } + // Custom RGB section button_y += 40; button_y += 20;