apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Add a display server and graphical user interface #38

Merged
apio merged 103 commits from display-server into main 2023-09-20 18:49:21 +00:00
Conversation 0 Commits 103 Files Changed 105 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fd4fc7e91 - Show all commits

4
apps/taskbar.cpp
View File

@ -8,6 +8,8 @@
#include <ui/Image.h>
#include <ui/Layout.h>
static constexpr ui::Color TASKBAR_COLOR = ui::Color::from_rgb(83, 83, 83);
void sigchld_handler(int)
{
wait(nullptr);
@ -26,7 +28,7 @@ Result<int> 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);

6
wind/Window.cpp
View File

@ -7,6 +7,8 @@
LinkedList<Window> 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<ui::Image> g_close_icon;