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 +10 -6
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b370a99aa6 - Show all commits

6
apps/about.cpp
View File

@ -5,6 +5,8 @@
#include <ui/Label.h>
#include <ui/Layout.h>
static constexpr ui::Color BACKGROUND_COLOR = ui::Color::from_rgb(89, 89, 89);
Result<int> luna_main(int argc, char** argv)
{
ui::App app;
@ -14,7 +16,7 @@ Result<int> luna_main(int argc, char** argv)
app.set_main_window(window);
window->set_title("About");
window->set_background(ui::CYAN);
window->set_background(BACKGROUND_COLOR);
utsname info;
uname(&info);
@ -22,7 +24,7 @@ Result<int> luna_main(int argc, char** argv)
ui::VerticalLayout main_layout;
window->set_main_widget(main_layout);
ui::Label title("About Luna", ui::VerticalAlignment::Center, ui::HorizontalAlignment::Center,
ui::Label title("About Luna", ui::WHITE, ui::VerticalAlignment::Center, ui::HorizontalAlignment::Center,
ui::Font::default_bold_font());
main_layout.add_widget(title);

3
libui/include/ui/Label.h
View File

@ -22,7 +22,7 @@ namespace ui
class Label final : public Widget
{
public:
Label(StringView text, VerticalAlignment valign = VerticalAlignment::Center,
Label(StringView text, ui::Color color = ui::WHITE, VerticalAlignment valign = VerticalAlignment::Center,
HorizontalAlignment halign = HorizontalAlignment::Center, SharedPtr<Font> font = Font::default_font());
void set_text(StringView text)
@ -36,6 +36,7 @@ namespace ui
StringView m_text;
VerticalAlignment m_valign;
HorizontalAlignment m_halign;
ui::Color m_color;
SharedPtr<Font> m_font;
};
}

7
libui/src/Label.cpp
View File

@ -12,8 +12,9 @@
namespace ui
{
Label::Label(StringView text, VerticalAlignment valign, HorizontalAlignment halign, SharedPtr<Font> font)
: m_text(text), m_valign(valign), m_halign(halign), m_font(font)
Label::Label(StringView text, ui::Color color, VerticalAlignment valign, HorizontalAlignment halign,
SharedPtr<Font> font)
: m_text(text), m_valign(valign), m_halign(halign), m_color(color), m_font(font)
{
}
@ -30,7 +31,7 @@ namespace ui
wchar_t buf[4096];
TRY(decoder.decode(buf, sizeof(buf)));
m_font->render(buf, ui::BLACK, subcanvas);
m_font->render(buf, m_color, subcanvas);
return {};
}
}