Merge pull request #232 from hex007/better-menus

Better handle Menu width
This commit is contained in:
Jools Wills 2017-08-30 05:35:14 +01:00 committed by GitHub
commit c397492625
2 changed files with 8 additions and 6 deletions

View file

@ -153,7 +153,8 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector
mGrid.setEntry(mButtons, Vector2i(0, 2), true, false); mGrid.setEntry(mButtons, Vector2i(0, 2), true, false);
// resize + center // resize + center
setSize(Renderer::getScreenWidth() * 0.5f, Renderer::getScreenHeight() * 0.82f); float width = std::min(Renderer::getScreenHeight(), (unsigned int) (Renderer::getScreenWidth() * 0.90f));
setSize(width, Renderer::getScreenHeight() * 0.82f);
setPosition((Renderer::getScreenWidth() - mSize.x()) / 2, (Renderer::getScreenHeight() - mSize.y()) / 2); setPosition((Renderer::getScreenWidth() - mSize.x()) / 2, (Renderer::getScreenHeight() - mSize.y()) / 2);
} }

View file

@ -63,7 +63,8 @@ void MenuComponent::updateSize()
} }
} }
setSize(Renderer::getScreenWidth() * 0.5f, height); float width = std::min(Renderer::getScreenHeight(), (unsigned int) (Renderer::getScreenWidth() * 0.90f));
setSize(width, height);
} }
void MenuComponent::onSizeChanged() void MenuComponent::onSizeChanged()