ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert layout manager changes as it breaks addon screen

Browse Source
This commit is contained in:
Benau 2019-11-08 13:27:50 +08:00
parent 8582258cae
commit 949752451c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/guiengine/layout_manager.cpp
View File

@ -247,8 +247,7 @@ void LayoutManager::readCoords(Widget* self)
//Add padding to <box> 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<Widget>& 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());