fix: fix settings menu layout, make it more readable

also add some asserts in static layout generation

Author: Totto16

src/scenes/settings_menu/settings_menu.cpp

@@ -86,16 +86,24 @@ namespace scenes {
                 }
         );
 
-        auto text_input_index = scroll_layout->add<ui::TextInput>(
+
+        scroll_layout->add<ui::Label>(
+                ui::RelativeItemSize{ scroll_layout->layout(), 0.2 }, service_provider, "Lobby",
+                service_provider->font_manager().get(FontId::Default), Color::white(),
+                std::pair<double, double>{ 0.1, 0.3 },
+                ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Bottom }
+        );
+
+        auto api_url_input_index = scroll_layout->add<ui::TextInput>(
                 ui::RelativeItemSize{ scroll_layout->layout(), 0.2 }, service_provider,
                 service_provider->font_manager().get(FontId::Default), Color::white(), focus_helper.focus_id(),
-                std::pair<double, double>{ 0.9, 0.9 },
+                std::pair<double, double>{ 0.8, 0.6 },
                 ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center },
                 ui::TextInputMode::Scale
         );
 
         if (auto api_url = m_settings.api_url; api_url.has_value()) {
-            scroll_layout->get<ui::TextInput>(text_input_index)->set_text(api_url.value());
+            scroll_layout->get<ui::TextInput>(api_url_input_index)->set_text(api_url.value());
         }
 
 
@@ -122,20 +130,21 @@ namespace scenes {
 
         auto return_layout_index = m_main_layout.add<ui::GridLayout>(
                 focus_helper.focus_id(), 2, ui::Direction::Horizontal, ui::AbsolutMargin{ 0 },
-                std::pair<double, double>{ 0.0, 0.1 }
+                std::pair<double, double>{ 0.2, 0.1 }
 
         );
 
         auto* return_layout = m_main_layout.get<ui::GridLayout>(return_layout_index);
 
+
         return_layout->add<ui::TextButton>(
-                service_provider, "Return asn Save", service_provider->font_manager().get(FontId::Default),
+                service_provider, "Return and Save", service_provider->font_manager().get(FontId::Default),
                 Color::white(), focus_helper.focus_id(),
                 [this](const ui::TextButton&) -> bool {
                     m_next_command = Command{ Return{ ReturnType::Save } };
                     return false;
                 },
-                std::pair<double, double>{ 0.15, 0.85 },
+                std::pair<double, double>{ 0.8, 0.85 },
                 ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center },
                 std::pair<double, double>{ 0.1, 0.1 }
         );
@@ -147,7 +156,7 @@ namespace scenes {
                     m_next_command = Command{ Return{ ReturnType::Cancel } };
                     return false;
                 },
-                std::pair<double, double>{ 0.15, 0.85 },
+                std::pair<double, double>{ 0.8, 0.85 },
                 ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center },
                 std::pair<double, double>{ 0.1, 0.1 }
         );

src/ui/components/text_button.cpp

@@ -19,8 +19,8 @@ ui::TextButton::TextButton(
                text, font,
                text_color, { fill_rect.top_left.x + static_cast<int>(margin.first),
                   fill_rect.top_left.y + static_cast<int>(margin.second),
-                  fill_rect.width() - 2 * static_cast<int>(margin.first),
-                  fill_rect.height() - 2 * static_cast<int>(margin.second) } },
+                  fill_rect.width() - (2 * static_cast<int>(margin.first)),
+                  fill_rect.height() - (2 * static_cast<int>(margin.second)) } },
           focus_id,
           std::move(callback),
           fill_rect,

src/ui/layouts/grid_layout.cpp

@@ -44,13 +44,17 @@ void ui::GridLayout::render(const ServiceProvider& service_provider) const {
 
     if (direction == Direction::Horizontal) {
         const u32 total_margin = this->size <= 1 ? 0 : (this->size - 1) * gap.get_margin();
+        assert(layout().get_rect().width() > (total_margin + (margin.first * 2))
+               && "width has to be greater than the margins");
         width = (layout().get_rect().width() - total_margin - (margin.first * 2)) / this->size;
 
         const u32 margin_x = index * gap.get_margin();
         const u32 total_width = width * index;
         x_pos += margin_x + total_width;
     } else {
         const u32 total_margin = this->size <= 1 ? 0 : (this->size - 1) * gap.get_margin();
+        assert(layout().get_rect().height() > (total_margin - (margin.second * 2))
+               && "height has to be greater than the margins");
         height = (layout().get_rect().height() - total_margin - (margin.second * 2)) / this->size;
 
         const u32 margin_y = index * gap.get_margin();