diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp index d0483d19..6b6c2441 100644 --- a/src/frontend/gui/controls.cpp +++ b/src/frontend/gui/controls.cpp @@ -146,8 +146,8 @@ Button* Button::textSupplier(wstringsupplier supplier) { return this; } -void Button::setSize(glm::vec2 size) { - Panel::setSize(size); +void Button::refresh() { + Panel::refresh(); if (label) { label->setSize(size-vec2(padding.z+padding.x, padding.w+padding.y)); } diff --git a/src/frontend/gui/controls.h b/src/frontend/gui/controls.h index c2d7d47c..970e203a 100644 --- a/src/frontend/gui/controls.h +++ b/src/frontend/gui/controls.h @@ -82,7 +82,7 @@ namespace gui { virtual Button* textSupplier(wstringsupplier supplier); - virtual void setSize(glm::vec2 size) override; + virtual void refresh() override; }; class RichButton : public Container { @@ -112,7 +112,7 @@ namespace gui { bool valid = true; public: TextBox(std::wstring placeholder, - glm::vec4 padding=glm::vec4(2.0f)); + glm::vec4 padding=glm::vec4(4.0f)); virtual std::shared_ptr getAt(glm::vec2 pos, std::shared_ptr self) override; diff --git a/src/frontend/gui/panels.cpp b/src/frontend/gui/panels.cpp index 26aeb41d..745c9120 100644 --- a/src/frontend/gui/panels.cpp +++ b/src/frontend/gui/panels.cpp @@ -164,6 +164,7 @@ int Panel::getMaxLength() const { void Panel::setPadding(glm::vec4 padding) { this->padding = padding; + refresh(); } glm::vec4 Panel::getPadding() const { diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 2211cd61..25e71300 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -60,7 +60,7 @@ static std::shared_ptr