diff --git a/Userland/Applications/HexEditor/GoToOffsetDialog.gml b/Userland/Applications/HexEditor/GoToOffsetDialog.gml index cfd7d9495f8..9504757f940 100644 --- a/Userland/Applications/HexEditor/GoToOffsetDialog.gml +++ b/Userland/Applications/HexEditor/GoToOffsetDialog.gml @@ -57,6 +57,6 @@ @GUI::Statusbar { name: "statusbar" - label_count: 2 + segment_count: 2 } } diff --git a/Userland/Applications/HexEditor/HexEditorWindow.gml b/Userland/Applications/HexEditor/HexEditorWindow.gml index 4a7d4e0935e..10a271af1bc 100644 --- a/Userland/Applications/HexEditor/HexEditorWindow.gml +++ b/Userland/Applications/HexEditor/HexEditorWindow.gml @@ -31,6 +31,6 @@ @GUI::Statusbar { name: "statusbar" - label_count: 5 + segment_count: 5 } } diff --git a/Userland/Applications/TextEditor/TextEditorWindow.gml b/Userland/Applications/TextEditor/TextEditorWindow.gml index 3f567a9a470..b8556df9a85 100644 --- a/Userland/Applications/TextEditor/TextEditorWindow.gml +++ b/Userland/Applications/TextEditor/TextEditorWindow.gml @@ -106,6 +106,6 @@ @GUI::Statusbar { name: "statusbar" - label_count: 2 + segment_count: 3 } } diff --git a/Userland/Games/Solitaire/Solitaire.gml b/Userland/Games/Solitaire/Solitaire.gml index 7dc3180edee..c2089f680ac 100644 --- a/Userland/Games/Solitaire/Solitaire.gml +++ b/Userland/Games/Solitaire/Solitaire.gml @@ -10,6 +10,6 @@ @GUI::Statusbar { name: "statusbar" - label_count: 3 + segment_count: 3 } } diff --git a/Userland/Games/Spider/Spider.gml b/Userland/Games/Spider/Spider.gml index 83ad5290344..1ed45a5299f 100644 --- a/Userland/Games/Spider/Spider.gml +++ b/Userland/Games/Spider/Spider.gml @@ -10,6 +10,6 @@ @GUI::Statusbar { name: "statusbar" - label_count: 3 + segment_count: 3 } } diff --git a/Userland/Libraries/LibGUI/Statusbar.cpp b/Userland/Libraries/LibGUI/Statusbar.cpp index cc66795e818..abce4af03cd 100644 --- a/Userland/Libraries/LibGUI/Statusbar.cpp +++ b/Userland/Libraries/LibGUI/Statusbar.cpp @@ -5,7 +5,6 @@ */ #include -#include #include #include #include @@ -17,7 +16,7 @@ REGISTER_WIDGET(GUI, Statusbar) namespace GUI { -Statusbar::Statusbar(int label_count) +Statusbar::Statusbar(int count) { set_fixed_height(18); set_layout(); @@ -25,26 +24,76 @@ Statusbar::Statusbar(int label_count) layout()->set_spacing(2); m_corner = add(); - set_label_count(label_count); + set_segment_count(count); REGISTER_STRING_PROPERTY("text", text, set_text); - REGISTER_INT_PROPERTY("label_count", label_count, set_label_count); + REGISTER_INT_PROPERTY("segment_count", segment_count, set_segment_count); } Statusbar::~Statusbar() { } -NonnullRefPtr