PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

important gui fixes

Browse Source
This commit is contained in:
MihailRis 2024-04-17 01:39:18 +03:00
parent 502ebf4075
commit 59f721543e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/gui/UINode.cpp
View File

@ -209,7 +209,7 @@ void UINode::setGravity(Gravity gravity) {
switch (gravity) { switch (gravity) {
case Gravity::top_left: case Gravity::top_left:
case Gravity::center_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::top_center:
case Gravity::center_center: case Gravity::center_center:
case Gravity::bottom_center: x = (parentSize.x-size.x)/2.0f; break; case Gravity::bottom_center: x = (parentSize.x-size.x)/2.0f; break;
@ -221,7 +221,7 @@ void UINode::setGravity(Gravity gravity) {
switch (gravity) { switch (gravity) {
case Gravity::top_left: case Gravity::top_left:
case Gravity::top_center: 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_left:
case Gravity::center_center: case Gravity::center_center:
case Gravity::center_right: y = (parentSize.y-size.y)/2.0f; break; case Gravity::center_right: y = (parentSize.y-size.y)/2.0f; break;

1
src/frontend/gui/containers.cpp
View File

@ -192,6 +192,7 @@ void Panel::cropToContent() {
} }
void Panel::add(std::shared_ptr<UINode> node) { void Panel::add(std::shared_ptr<UINode> node) {
node->setResizing(true);
Container::add(node); Container::add(node);
refresh(); refresh();
cropToContent(); cropToContent();

2
src/frontend/gui/gui_xml.cpp
View File

@ -35,7 +35,7 @@ static Gravity gravity_from_string(const std::string& str) {
{"bottom-right", Gravity::bottom_right}, {"bottom-right", Gravity::bottom_right},
}; };
auto found = gravity_names.find(str); auto found = gravity_names.find(str);
if (found == gravity_names.end()) { if (found != gravity_names.end()) {
return found->second; return found->second;
} }
return Gravity::none; return Gravity::none;