From e8157ab549ecbbfd31e989bd8ea3c5a4626b6def Mon Sep 17 00:00:00 2001
From: zhenyan121 <3367366583@qq.com>
Date: Mon, 13 Jul 2026 13:06:09 +0800
Subject: [PATCH] refactor(ui): move scale property to subclasses and fix
 resize event handling

Remove scale from base Widget class and add per-type set_scale/scale methods to Button, Image, and Label. Dispatch separate WindowResizeEvent alongside existing FrameBufferResizeEvent. Correct centering calculations from `+` to `-` in main menu and world UI managers.
---
 include/Cubed/ui/button.hpp     |  4 ++--
 include/Cubed/ui/image.hpp      |  2 ++
 include/Cubed/ui/label.hpp      |  3 +++
 include/Cubed/ui/widget.hpp     |  4 +---
 src/app.cpp                     | 17 +++++++++++++----
 src/debug_collector.cpp         |  8 ++++----
 src/ui/button.cpp               | 10 ++++++----
 src/ui/image.cpp                |  6 +++++-
 src/ui/label.cpp                |  7 +++++--
 src/ui/main_menu_ui_manager.cpp | 17 ++++++++++-------
 src/ui/widget.cpp               |  6 ------
 src/ui/world_ui_manager.cpp     | 14 ++++++++------
 12 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/include/Cubed/ui/button.hpp b/include/Cubed/ui/button.hpp
index 2b34a28..0e32cfd 100644
--- a/include/Cubed/ui/button.hpp
+++ b/include/Cubed/ui/button.hpp
@@ -24,10 +24,10 @@ public:
 
     Widget& set_position(const glm::vec2& pos) override;
     Widget& set_position(float x, float y) override;
-    Widget& set_scale(float scale) override;
+    Button& set_scale(float scale);
     float width() const override;
     float height() const override;
-
+    float scale() const;
     template <typename F> Button& set_clicked(F&& f) {
         m_clicked = std::forward<F>(f);
         return *this;
diff --git a/include/Cubed/ui/image.hpp b/include/Cubed/ui/image.hpp
index 4a414b0..7719bde 100644
--- a/include/Cubed/ui/image.hpp
+++ b/include/Cubed/ui/image.hpp
@@ -16,6 +16,8 @@ public:
     float width() const override;
     float height() const override;
     const Texture* texture() const;
+    Image& set_scale(float scale);
+    float scale() const;
 
 private:
     const Texture* m_texture = nullptr;
diff --git a/include/Cubed/ui/label.hpp b/include/Cubed/ui/label.hpp
index 0435eca..1bc5ea5 100644
--- a/include/Cubed/ui/label.hpp
+++ b/include/Cubed/ui/label.hpp
@@ -17,6 +17,7 @@ public:
     Label& set_text(std::string_view text);
 
     Label& set_color(Color color);
+    Label& set_scale(float scale);
     virtual void update(float dt) override;
     virtual void render(Renderer& renderer) override;
 
@@ -28,6 +29,7 @@ public:
     float height() const override;
     float offset_x() const;
     float offset_y() const;
+    float scale() const;
 
 protected:
     virtual void on_update(float dt) override;
@@ -40,6 +42,7 @@ private:
     float m_real_height = 0.0f;
     float m_offset_x = 0.0f;
     float m_offset_y = 0.0f;
+    float m_scale = 1.0f;
     void update_vertices();
 };
 } // namespace Cubed
\ No newline at end of file
diff --git a/include/Cubed/ui/widget.hpp b/include/Cubed/ui/widget.hpp
index 64d8eb5..e23f139 100644
--- a/include/Cubed/ui/widget.hpp
+++ b/include/Cubed/ui/widget.hpp
@@ -18,11 +18,10 @@ public:
     virtual const std::string& id() const;
     virtual Widget& set_position(const glm::vec2& pos);
     virtual Widget& set_position(float x, float y);
-    virtual Widget& set_scale(float scale);
+    // Returns the final display size
     virtual float width() const;
     virtual float height() const;
     virtual const glm::vec2& pos() const;
-    virtual float scale() const;
 
     virtual bool handle_key_event(const KeyEvent& e);
     virtual bool handle_mouse_button_event(const MouseButtonEvent& e);
@@ -41,7 +40,6 @@ protected:
     virtual void on_update(float dt);
     virtual void on_render(Renderer& renderer);
     std::string m_id;
-    float m_scale = 1.0f;
     // Center is at the top-left corner, position is at the top-left corner
     glm::vec2 m_pos{0.0f, 0.0f};
 
diff --git a/src/app.cpp b/src/app.cpp
index 2c69610..359ace6 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -677,12 +677,21 @@ void App::run() {
 // static Gait player_gait = Gait::WALK;
 void App::update() {
     glfwPollEvents();
+    {
+        int w, h;
+        glfwGetFramebufferSize(m_window.get_glfw_window(), &w, &h);
 
-    int w, h;
-    glfwGetFramebufferSize(m_window.get_glfw_window(), &w, &h);
+        if (w != m_renderer.frame_width() || h != m_renderer.frame_height()) {
+            dispatch_event(FrameBufferResizeEvent{w, h});
+        }
+    }
+    {
+        int w, h;
+        glfwGetWindowSize(m_window.get_glfw_window(), &w, &h);
 
-    if (w != m_renderer.frame_width() || h != m_renderer.frame_height()) {
-        dispatch_event(FrameBufferResizeEvent{w, h});
+        if (w != m_renderer.window_width() || h != m_renderer.window_height()) {
+            dispatch_event(WindowResizeEvent{w, h});
+        }
     }
 
     current_time = glfwGetTime();
diff --git a/src/debug_collector.cpp b/src/debug_collector.cpp
index ca183d6..84efd49 100644
--- a/src/debug_collector.cpp
+++ b/src/debug_collector.cpp
@@ -23,8 +23,8 @@ void DebugCollector::init_text() {
 #endif
     version_text.set_color(Color::WHITE)
         .set_text(version)
-        .set_position(0.0f, 100.0f)
-        .set_scale(0.8f);
+        .set_scale(0.8f)
+        .set_position(0.0f, 100.0f);
     m_component.try_emplace(version_text.id(), &version_text);
 
     // fps
@@ -35,8 +35,8 @@ void DebugCollector::init_text() {
     // player_pos
     auto& player_pos_text = m_widget.add_child<Label>("player_pos");
     player_pos_text.set_text("x: 0.00 y: 0.00 z: 0.00")
-        .set_position(0.0f, 150.0f)
-        .set_scale(0.8f);
+        .set_scale(0.8f)
+        .set_position(0.0f, 150.0f);
     m_component.try_emplace(player_pos_text.id(), &player_pos_text);
 
     // rendered_chunk
diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index b6875a9..7d5e1be 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -59,14 +59,16 @@ Widget& Button::set_position(const glm::vec2& pos) {
 Widget& Button::set_position(float x, float y) {
     return set_position(glm::vec2{x, y});
 }
-Widget& Button::set_scale(float scale) {
-    m_scale = scale;
+Button& Button::set_scale(float scale) {
     m_background->set_scale(scale);
     m_max_pos.x = m_min_pos.x + width();
     m_max_pos.y = m_min_pos.y + height();
     return *this;
 }
-float Button::width() const { return m_background->width() * m_scale; }
-float Button::height() const { return m_background->height() * m_scale; }
+
+float Button::scale() const { return m_background->scale(); }
+
+float Button::width() const { return m_background->width(); }
+float Button::height() const { return m_background->height(); }
 
 } // namespace Cubed
\ No newline at end of file
diff --git a/src/ui/image.cpp b/src/ui/image.cpp
index 3338d6f..9b2d785 100644
--- a/src/ui/image.cpp
+++ b/src/ui/image.cpp
@@ -13,7 +13,11 @@ Image& Image::set_image(const std::string& path,
     m_texture = texture_manager.get_image_texture(path);
     return *this;
 }
-
+Image& Image::set_scale(float scale) {
+    m_scale = scale;
+    return *this;
+}
+float Image::scale() const { return m_scale; }
 float Image::height() const {
     if (!m_texture) {
         Logger::error("Image id {} not set image!", m_id);
diff --git a/src/ui/label.cpp b/src/ui/label.cpp
index d7ca24d..2fe1bd8 100644
--- a/src/ui/label.cpp
+++ b/src/ui/label.cpp
@@ -15,7 +15,10 @@ Label& Label::set_color(Color color) {
     m_text.color = color;
     return *this;
 }
-
+Label& Label::set_scale(float scale) {
+    m_scale = scale;
+    return *this;
+}
 void Label::update(float dt) { on_update(dt); }
 
 void Label::on_update(float dt) { (void)dt; }
@@ -43,5 +46,5 @@ float Label::width() const { return m_real_width * m_scale; }
 float Label::height() const { return m_real_height * m_scale; }
 float Label::offset_x() const { return m_offset_x; }
 float Label::offset_y() const { return m_offset_y; }
-
+float Label::scale() const { return m_scale; }
 } // namespace Cubed
\ No newline at end of file
diff --git a/src/ui/main_menu_ui_manager.cpp b/src/ui/main_menu_ui_manager.cpp
index a6339b5..b14f918 100644
--- a/src/ui/main_menu_ui_manager.cpp
+++ b/src/ui/main_menu_ui_manager.cpp
@@ -22,19 +22,22 @@ void MainMenuUIManager::init() {
 
     start_game_button->set_clicked(
         [this]() { m_scene.scene_manager().request_push(SceneType::WORLD); });
-    start_game_button->set_position(
-        m_scene.scene_manager().app().renderer().window_width() / 2.0f +
-            back.width() / 2.0f,
-        m_scene.scene_manager().app().renderer().window_width() / 2.0f +
-            back.height() / 2.0f);
     start_game_button->set_scale(3.0f);
+    start_game_button->set_position(
+        m_scene.scene_manager().app().renderer().window_width() / 2.0f -
+            back.width() / 2.0f,
+        m_scene.scene_manager().app().renderer().window_height() / 2.0f -
+            back.height() / 2.0f);
+
     m_widgets.try_emplace("start game", std::move(start_game_button));
 }
+
 void MainMenuUIManager::update(float dt) {
     for (auto& w : m_widgets) {
         w.second->update(dt);
     }
 }
+
 void MainMenuUIManager::render(Renderer& renderer) {
     renderer.begin_render_ui();
 
@@ -101,8 +104,8 @@ bool MainMenuUIManager::handle_window_resize_event(const WindowResizeEvent& e) {
     if (it != m_widgets.end()) {
         auto* start_game = dynamic_cast<Button*>(it->second.get());
         if (start_game) {
-            start_game->set_position(e.width / 2 + start_game->width() / 2,
-                                     e.height / 2 + start_game->height() / 2);
+            start_game->set_position(e.width / 2 - start_game->width() / 2,
+                                     e.height / 2 - start_game->height() / 2);
         }
     }
     for (auto& w : m_widgets) {
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index 3071a53..be461ee 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -31,16 +31,10 @@ Widget& Widget::set_position(float x, float y) {
     return *this;
 }
 
-Widget& Widget::set_scale(float scale) {
-    m_scale = scale;
-    return *this;
-}
-
 float Widget::width() const { return 0.0f; }
 float Widget::height() const { return 0.0f; }
 
 const glm::vec2& Widget::pos() const { return m_pos; }
-float Widget::scale() const { return m_scale; }
 const std::string& Widget::id() const { return m_id; }
 
 bool Widget::handle_key_event(const KeyEvent& e) {
diff --git a/src/ui/world_ui_manager.cpp b/src/ui/world_ui_manager.cpp
index 763318f..22d0246 100644
--- a/src/ui/world_ui_manager.cpp
+++ b/src/ui/world_ui_manager.cpp
@@ -16,10 +16,11 @@ void WorldUIManager::init() {
     crosshair->set_image("texture/ui/0.png",
                          m_scene.scene_manager().app().texture_manager());
     auto& renderer = m_scene.scene_manager().app().renderer();
-    crosshair
-        ->set_position(renderer.window_width() / 2 + crosshair->width() / 2,
-                       renderer.window_height() / 2 + crosshair->height() / 2)
-        .set_scale(3.0f);
+
+    crosshair->set_scale(3.0f).set_position(
+        renderer.window_width() / 2 - crosshair->width() / 2,
+        renderer.window_height() / 2 - crosshair->height() / 2);
+
     m_widgets.try_emplace("crosshair", std::move(crosshair));
 }
 void WorldUIManager::update(float dt) {
@@ -96,8 +97,9 @@ bool WorldUIManager::handle_window_resize_event(const WindowResizeEvent& e) {
     if (it != m_widgets.end()) {
         auto* crosshair = dynamic_cast<Image*>(it->second.get());
         if (crosshair) {
-            crosshair->set_position(e.width / 2 + crosshair->width() / 2,
-                                    e.height / 2 + crosshair->height() / 2);
+            crosshair->set_position(e.width / 2.0f - crosshair->width() / 2.0f,
+                                    e.height / 2.0f -
+                                        crosshair->height() / 2.0f);
         }
     }
     for (auto& w : m_widgets) {