From 949752451cadd8c1e946cde2bcb71685db1df1b9 Mon Sep 17 00:00:00 2001 From: Benau Date: Fri, 8 Nov 2019 13:27:50 +0800 Subject: [PATCH] Revert layout manager changes as it breaks addon screen --- src/guiengine/layout_manager.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp index ad0b9c3e2..1d1c3ecb3 100644 --- a/src/guiengine/layout_manager.cpp +++ b/src/guiengine/layout_manager.cpp @@ -247,8 +247,7 @@ void LayoutManager::readCoords(Widget* self) //Add padding to elements if (self->getType() == WTYPE_DIV && self->m_show_bounding_box) { - int padding = std::min(irr_driver->getActualScreenSize().Height, - irr_driver->getActualScreenSize().Width) / 36.0f; + int padding = GUIEngine::getFontHeight() / 2; if (self->m_properties[PROP_DIV_PADDING].length() > 0) padding = atoi(self->m_properties[PROP_DIV_PADDING].c_str()); child_max_height += padding * 2; @@ -323,8 +322,7 @@ void LayoutManager::applyCoords(Widget* self, AbstractTopLevelContainer* topLeve if (parent != NULL && parent->getType() == WTYPE_DIV && parent->m_show_bounding_box) { - int padding = std::min(irr_driver->getActualScreenSize().Height, - irr_driver->getActualScreenSize().Width) / 36.0f; + int padding = GUIEngine::getFontHeight() / 2; if (parent->m_properties[PROP_DIV_PADDING].length() > 0) padding = atoi(parent->m_properties[PROP_DIV_PADDING].c_str()); @@ -450,8 +448,7 @@ void LayoutManager::doCalculateLayout(PtrVector& widgets, AbstractTopLev if (parent != NULL && parent->getType() == WTYPE_DIV && parent->m_show_bounding_box) { - int padding = std::min(irr_driver->getActualScreenSize().Height, - irr_driver->getActualScreenSize().Width) / 36.0f; + int padding = GUIEngine::getFontHeight() / 2; if (parent->m_properties[PROP_DIV_PADDING].length() > 0) padding = atoi(parent->m_properties[PROP_DIV_PADDING].c_str());