RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 12:45:07 +00:00
Code Issues Activity Actions

About+LibGUI: Use a GBoxLayout for the About app.

Browse source
This commit is contained in:
Andreas Kling 2019-03-09 21:09:29 +01:00
parent eac3a6ad52
commit b8f999cbef
3 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Applications/About/main.cpp
View file

@ -2,6 +2,7 @@
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <LibGUI/GLabel.h> #include <LibGUI/GLabel.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <LibGUI/GBoxLayout.h>
#include <sys/utsname.h> #include <sys/utsname.h>
int main(int argc, char** argv) int main(int argc, char** argv)
@ -10,23 +11,27 @@ int main(int argc, char** argv)
auto* window = new GWindow; auto* window = new GWindow;
window->set_title("About Serenity"); window->set_title("About Serenity");
window->set_rect(362, 284, 240, 130); Rect window_rect { 0, 0, 240, 120 };
window_rect.center_within({ 0, 0, 1024, 768 });
window->set_rect(window_rect);
window->set_should_exit_app_on_close(true); window->set_should_exit_app_on_close(true);
auto* widget = new GWidget; auto* widget = new GWidget;
window->set_main_widget(widget); window->set_main_widget(widget);
widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
widget->layout()->set_margins({ 0, 8, 0, 8 });
widget->layout()->set_spacing(8);
auto* icon_label = new GLabel(widget); auto* icon_label = new GLabel(widget);
icon_label->set_icon(GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/Serenity.rgb", { 32, 32 })); icon_label->set_icon(GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/Serenity.rgb", { 32, 32 }));
icon_label->set_relative_rect( icon_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
widget->rect().center().x() - 16, icon_label->set_preferred_size({ 32, 32 });
10,
32, 32);
auto* label = new GLabel(widget); auto* label = new GLabel(widget);
label->set_font(Font::default_bold_font()); label->set_font(Font::default_bold_font());
label->set_text("Serenity Operating System"); label->set_text("Serenity Operating System");
label->set_relative_rect(0, 50, widget->width(), 20); label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
label->set_preferred_size({ 0, 11 });
utsname uts; utsname uts;
int rc = uname(&uts); int rc = uname(&uts);
@ -34,11 +39,13 @@ int main(int argc, char** argv)
auto* version_label = new GLabel(widget); auto* version_label = new GLabel(widget);
version_label->set_text(String::format("Version %s", uts.release)); version_label->set_text(String::format("Version %s", uts.release));
version_label->set_relative_rect(0, 70, widget->width(), 20); version_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
version_label->set_preferred_size({ 0, 11 });
auto* quit_button = new GButton(widget); auto* quit_button = new GButton(widget);
quit_button->set_caption("Okay"); quit_button->set_caption("Okay");
quit_button->set_relative_rect(80, 100, widget->width() - 160, 20); quit_button->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
quit_button->set_preferred_size({ 100, 20 });
quit_button->on_click = [] (GButton&) { quit_button->on_click = [] (GButton&) {
GApplication::the().quit(0); GApplication::the().quit(0);
}; };

23
LibGUI/GBoxLayout.cpp
View file

@ -3,6 +3,10 @@
//#define GBOXLAYOUT_DEBUG //#define GBOXLAYOUT_DEBUG
#ifdef GBOXLAYOUT_DEBUG
#include <stdio.h>
#endif
GBoxLayout::GBoxLayout(Orientation orientation) GBoxLayout::GBoxLayout(Orientation orientation)
: m_orientation(orientation) : m_orientation(orientation)
{ {
@ -47,7 +51,7 @@ void GBoxLayout::run(GWidget& widget)
int number_of_entries_with_automatic_size = m_entries.size() - number_of_entries_with_fixed_size; int number_of_entries_with_automatic_size = m_entries.size() - number_of_entries_with_fixed_size;
#ifdef GBOXLAYOUT_DEBUG #ifdef GBOXLAYOUT_DEBUG
dbgprintf("GBoxLayout: available_size=%d, fixed=%d, fill=%d\n", available_size.height(), number_of_entries_with_fixed_size, number_of_entries_with_automatic_size); printf("GBoxLayout: available_size=%s, fixed=%d, fill=%d\n", available_size.to_string().characters(), number_of_entries_with_fixed_size, number_of_entries_with_automatic_size);
#endif #endif
Size automatic_size; Size automatic_size;
@ -63,7 +67,7 @@ void GBoxLayout::run(GWidget& widget)
} }
#ifdef GBOXLAYOUT_DEBUG #ifdef GBOXLAYOUT_DEBUG
dbgprintf("GBoxLayout: automatic_size=%s\n", automatic_size.to_string().characters()); printf("GBoxLayout: automatic_size=%s\n", automatic_size.to_string().characters());
#endif #endif
int current_x = margins().left(); int current_x = margins().left();
@ -76,19 +80,26 @@ void GBoxLayout::run(GWidget& widget)
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
ASSERT(entry.widget); ASSERT(entry.widget);
rect.set_size({ automatic_size.width() - margins().left() - margins().right(), automatic_size.height() - margins().top() - margins().bottom() }); rect.set_size(automatic_size.width() - margins().left() - margins().right(), automatic_size.height() - margins().top() - margins().bottom());
if (entry.widget->size_policy(Orientation::Vertical) == SizePolicy::Fixed) if (entry.widget->size_policy(Orientation::Vertical) == SizePolicy::Fixed)
rect.set_height(entry.widget->preferred_size().height()); rect.set_height(entry.widget->preferred_size().height());
if (entry.widget->size_policy(Orientation::Horizontal) == SizePolicy::Fixed) if (entry.widget->size_policy(Orientation::Horizontal) == SizePolicy::Fixed)
rect.set_width(entry.widget->preferred_size().width()); rect.set_width(entry.widget->preferred_size().width());
if (orientation() == Orientation::Horizontal) if (orientation() == Orientation::Horizontal) {
if (entry.widget->size_policy(Orientation::Vertical) == SizePolicy::Fill)
rect.set_height(widget.height() - margins().top() - margins().bottom());
rect.center_vertically_within(widget.rect()); rect.center_vertically_within(widget.rect());
else } else {
if (entry.widget->size_policy(Orientation::Horizontal) == SizePolicy::Fill)
rect.set_width(widget.width() - margins().left() - margins().right());
rect.center_horizontally_within(widget.rect()); rect.center_horizontally_within(widget.rect());
}
#ifdef GBOXLAYOUT_DEBUG #ifdef GBOXLAYOUT_DEBUG
dbgprintf("GBoxLayout: apply, %s{%p} <- %s\n", entry.widget->class_name(), entry.widget.ptr(), rect.to_string().characters()); printf("GBoxLayout: apply, %s{%p} <- %s\n", entry.widget->class_name(), entry.widget.ptr(), rect.to_string().characters());
#endif #endif
entry.widget->set_relative_rect(rect); entry.widget->set_relative_rect(rect);

6
SharedGraphics/Rect.h
View file

@ -62,6 +62,12 @@ public:
m_size = size; m_size = size;
} }
void set_size(int width, int height)
{
m_size.set_width(width);
m_size.set_height(height);
}
void inflate(int w, int h) void inflate(int w, int h)
{ {
set_x(x() - w / 2); set_x(x() - w / 2);