Remove scrollable page from gsr page, fix crash when navigating back

This commit is contained in:
dec05eba
2024-08-24 14:08:25 +02:00
parent 54c60d9a18
commit b8e6949dfb
13 changed files with 136 additions and 88 deletions

View File

@@ -1,7 +1,6 @@
#pragma once
#include "Page.hpp"
#include "ScrollablePage.hpp"
#include "Button.hpp"
#include <mglpp/graphics/Text.hpp>
@@ -19,20 +18,21 @@ namespace gsr {
mgl::vec2f get_size() override;
mgl::vec2f get_inner_size() override;
void add_widget(std::unique_ptr<Widget> widget) override;
void set_margins(float top, float bottom, float left, float right);
void set_on_back_button_click(std::function<void()> on_click_handler);
private:
void draw_page_label(mgl::Window &window, mgl::vec2f body_pos);
void draw_children(mgl::Window &window, mgl::vec2f position);
float get_border_size() const;
float get_horizontal_spacing() const;
mgl::vec2f get_content_position();
mgl::vec2f get_content_position_with_margin();
private:
float margin_top_scale = 0.0f;
float margin_bottom_scale = 0.0f;
float margin_left_scale = 0.0f;
float margin_right_scale = 0.0f;
ScrollablePage scrollable_body;
Button back_button;
mgl::Text label_text;
};