diff --git a/apps/taskbar.cpp b/apps/taskbar.cpp index 9283d6e6..e179f5fa 100644 --- a/apps/taskbar.cpp +++ b/apps/taskbar.cpp @@ -8,6 +8,8 @@ #include #include +static constexpr ui::Color TASKBAR_COLOR = ui::Color::from_rgb(83, 83, 83); + void sigchld_handler(int) { wait(nullptr); @@ -26,7 +28,7 @@ Result luna_main(int argc, char** argv) auto window = TRY(ui::Window::create(bar, false)); app.set_main_window(window); - window->set_background(ui::GRAY); + window->set_background(TASKBAR_COLOR); ui::HorizontalLayout layout(ui::AdjustHeight::Yes, ui::AdjustWidth::No); window->set_main_widget(layout); diff --git a/wind/Window.cpp b/wind/Window.cpp index 43e0e5ad..4bee2242 100644 --- a/wind/Window.cpp +++ b/wind/Window.cpp @@ -7,6 +7,8 @@ LinkedList g_windows; +static constexpr ui::Color TITLEBAR_COLOR = ui::Color::from_rgb(53, 53, 53); + void Window::draw(ui::Canvas& screen) { dirty = false; @@ -21,10 +23,10 @@ void Window::draw(ui::Canvas& screen) auto font = ui::Font::default_font(); auto titlebar_canvas = window.subcanvas(titlebar); - titlebar_canvas.fill(ui::GRAY); + titlebar_canvas.fill(TITLEBAR_COLOR); auto textarea = titlebar_canvas.subcanvas(ui::Rect { 10, 10, titlebar_canvas.width - 10, titlebar_canvas.height }); - font->render(buffer, ui::BLACK, textarea); + font->render(buffer, ui::WHITE, textarea); static SharedPtr g_close_icon;