1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:47:35 +00:00

LibGUI: Rewrite layout system in terms of min and max sizes

This patch removes size policies and preferred sizes, and replaces them
with min-size and max-size for each widget.

Box layout now works in 3 passes:

    1) Set all items (widgets/spacers) to their min-size
    2) Distribute remaining space evenly, respecting max-size
    3) Place widgets one after the other, adding spacing in between

I've also added convenience helpers for setting a fixed size (which is
the same as setting min-size and max-size to the same value.)

This significantly reduces the verbosity of widget layout and makes GML
a bit more pleasant to write, too. :^)
This commit is contained in:
Andreas Kling 2020-12-30 01:23:32 +01:00
parent b2bba5ce5c
commit 7dc5a3ead8
83 changed files with 444 additions and 957 deletions

View file

@ -6,8 +6,7 @@
}
@GUI::Widget {
vertical_size_policy: "Fixed"
preferred_height: 44
fixed_height: 44
layout: @GUI::HorizontalBoxLayout {
spacing: 10
@ -24,8 +23,7 @@
}
@GUI::Widget {
vertical_size_policy: "Fixed"
preferred_height: 18
fixed_height: 18
layout: @GUI::HorizontalBoxLayout {
}
@ -33,8 +31,7 @@
@GUI::Label {
text: "Executable path:"
text_alignment: "CenterLeft"
horizontal_size_policy: "Fixed"
preferred_width: 90
fixed_width: 90
}
@GUI::LinkLabel {
@ -44,8 +41,7 @@
}
@GUI::Widget {
vertical_size_policy: "Fixed"
preferred_height: 18
fixed_height: 18
layout: @GUI::HorizontalBoxLayout {
}
@ -53,8 +49,7 @@
@GUI::Label {
text: "Coredump path:"
text_alignment: "CenterLeft"
horizontal_size_policy: "Fixed"
preferred_width: 90
fixed_width: 90
}
@GUI::LinkLabel {
@ -64,8 +59,7 @@
}
@GUI::Widget {
vertical_size_policy: "Fixed"
preferred_height: 18
fixed_height: 18
layout: @GUI::HorizontalBoxLayout {
}
@ -82,27 +76,20 @@
}
@GUI::Widget {
vertical_size_policy: "Fixed"
preferred_height: 32
fixed_height: 32
layout: @GUI::HorizontalBoxLayout {
}
// HACK: We need something like Layout::add_spacer() in GML! :^)
@GUI::Widget {
horizontal_size_policy: "Fixed"
vertical_size_policy: "Fill"
preferred_width: 377
preferred_height: 0
}
@GUI::Button {
name: "close_button"
text: "Close"
horizontal_size_policy: "Fixed"
vertical_size_policy: "Fixed"
preferred_width: 70
preferred_height: 22
fixed_width: 70
fixed_height: 22
}
}
}