From 59f721543e4966ed98ede535aa185d91082e6d1a Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 17 Apr 2024 01:39:18 +0300 Subject: [PATCH] important gui fixes --- src/frontend/gui/UINode.cpp | 4 ++-- src/frontend/gui/containers.cpp | 1 + src/frontend/gui/gui_xml.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/gui/UINode.cpp b/src/frontend/gui/UINode.cpp index 9d5d60dd..15ff2927 100644 --- a/src/frontend/gui/UINode.cpp +++ b/src/frontend/gui/UINode.cpp @@ -209,7 +209,7 @@ void UINode::setGravity(Gravity gravity) { switch (gravity) { case Gravity::top_left: case Gravity::center_left: - case Gravity::bottom_left: x = parentSize.x+margin.x; break; + case Gravity::bottom_left: x = margin.x; break; case Gravity::top_center: case Gravity::center_center: case Gravity::bottom_center: x = (parentSize.x-size.x)/2.0f; break; @@ -221,7 +221,7 @@ void UINode::setGravity(Gravity gravity) { switch (gravity) { case Gravity::top_left: case Gravity::top_center: - case Gravity::top_right: y = parentSize.y+margin.y; break; + case Gravity::top_right: y = margin.y; break; case Gravity::center_left: case Gravity::center_center: case Gravity::center_right: y = (parentSize.y-size.y)/2.0f; break; diff --git a/src/frontend/gui/containers.cpp b/src/frontend/gui/containers.cpp index 9f89d2f8..4aadc534 100644 --- a/src/frontend/gui/containers.cpp +++ b/src/frontend/gui/containers.cpp @@ -192,6 +192,7 @@ void Panel::cropToContent() { } void Panel::add(std::shared_ptr node) { + node->setResizing(true); Container::add(node); refresh(); cropToContent(); diff --git a/src/frontend/gui/gui_xml.cpp b/src/frontend/gui/gui_xml.cpp index 8672d5b7..751a3a2f 100644 --- a/src/frontend/gui/gui_xml.cpp +++ b/src/frontend/gui/gui_xml.cpp @@ -35,7 +35,7 @@ static Gravity gravity_from_string(const std::string& str) { {"bottom-right", Gravity::bottom_right}, }; auto found = gravity_names.find(str); - if (found == gravity_names.end()) { + if (found != gravity_names.end()) { return found->second; } return Gravity::none;