From d6eba6ae24c2dfea027f8977115b2288718e1bda Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 23 May 2021 10:40:11 +0200 Subject: [PATCH] Adjusted the size and position of the various menus. --- es-app/src/guis/GuiGamelistFilter.cpp | 2 +- es-app/src/guis/GuiMenu.cpp | 4 ++-- es-app/src/guis/GuiScraperMenu.cpp | 2 +- es-app/src/guis/GuiSettings.cpp | 3 ++- es-core/src/components/MenuComponent.cpp | 6 +++--- es-core/src/components/MenuComponent.h | 2 +- es-core/src/components/OptionListComponent.h | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/es-app/src/guis/GuiGamelistFilter.cpp b/es-app/src/guis/GuiGamelistFilter.cpp index a2c9ff719..135516d8c 100644 --- a/es-app/src/guis/GuiGamelistFilter.cpp +++ b/es-app/src/guis/GuiGamelistFilter.cpp @@ -51,7 +51,7 @@ void GuiGamelistFilter::initializeMenu() mMenu.addButton("BACK", "back", std::bind(&GuiGamelistFilter::applyFilters, this)); mMenu.setPosition((Renderer::getScreenWidth() - mMenu.getSize().x()) / 2.0f, - Renderer::getScreenHeight() * 0.15f); + Renderer::getScreenHeight() * 0.13f); // Save the initial filter values to be able to check later if any changes were made. mInitialTextFilter = mTextFilterField->getValue(); diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 4362b0465..18e34e7eb 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -70,8 +70,8 @@ GuiMenu::GuiMenu(Window* window) : GuiComponent(window), addChild(&mMenu); addVersionInfo(); setSize(mMenu.getSize()); - setPosition((Renderer::getScreenWidth() - mSize.x()) / 2, - Renderer::getScreenHeight() * 0.15f); + setPosition((Renderer::getScreenWidth() - mSize.x()) / 2.0f, + Renderer::getScreenHeight() * 0.13f); } GuiMenu::~GuiMenu() diff --git a/es-app/src/guis/GuiScraperMenu.cpp b/es-app/src/guis/GuiScraperMenu.cpp index 67e941bfd..0ccee5684 100644 --- a/es-app/src/guis/GuiScraperMenu.cpp +++ b/es-app/src/guis/GuiScraperMenu.cpp @@ -107,7 +107,7 @@ GuiScraperMenu::GuiScraperMenu(Window* window, std::string title) setSize(mMenu.getSize()); setPosition((Renderer::getScreenWidth() - mSize.x()) / 2, - Renderer::getScreenHeight() * 0.15f); + Renderer::getScreenHeight() * 0.13f); } GuiScraperMenu::~GuiScraperMenu() diff --git a/es-app/src/guis/GuiSettings.cpp b/es-app/src/guis/GuiSettings.cpp index d7d30bb8d..bb8b7a8d7 100644 --- a/es-app/src/guis/GuiSettings.cpp +++ b/es-app/src/guis/GuiSettings.cpp @@ -41,7 +41,8 @@ GuiSettings::GuiSettings( setSize(static_cast(Renderer::getScreenWidth()), static_cast(Renderer::getScreenHeight())); - mMenu.setPosition((mSize.x() - mMenu.getSize().x()) / 2, Renderer::getScreenHeight() * 0.15f); + mMenu.setPosition((mSize.x() - mMenu.getSize().x()) / 2.0f, + Renderer::getScreenHeight() * 0.13f); } GuiSettings::~GuiSettings() diff --git a/es-core/src/components/MenuComponent.cpp b/es-core/src/components/MenuComponent.cpp index d16b4ac54..6360285f9 100644 --- a/es-core/src/components/MenuComponent.cpp +++ b/es-core/src/components/MenuComponent.cpp @@ -81,9 +81,9 @@ float MenuComponent::getButtonGridHeight() const void MenuComponent::updateSize() { - const float maxHeight = Renderer::getScreenHeight() * 0.75f; + const float maxHeight = Renderer::getScreenHeight() * 0.80f; float height = TITLE_HEIGHT + mList->getTotalRowHeight() + getButtonGridHeight() + - (2 * Renderer::getScreenHeightModifier()); + (2.0f * Renderer::getScreenHeightModifier()); if (height > maxHeight) { height = TITLE_HEIGHT + getButtonGridHeight(); int i = 0; @@ -107,7 +107,7 @@ void MenuComponent::onSizeChanged() { mBackground.fitTo(mSize, Vector3f::Zero(), Vector2f(-32, -32)); - // Update grid row/col sizes. + // Update grid row/column sizes. mGrid.setRowHeightPerc(0, TITLE_HEIGHT / mSize.y()); mGrid.setRowHeightPerc(2, getButtonGridHeight() / mSize.y()); diff --git a/es-core/src/components/MenuComponent.h b/es-core/src/components/MenuComponent.h index a0b084f6e..e73ae37c5 100644 --- a/es-core/src/components/MenuComponent.h +++ b/es-core/src/components/MenuComponent.h @@ -31,7 +31,7 @@ class MenuComponent : public GuiComponent public: MenuComponent(Window* window, std::string title, const std::shared_ptr& titleFont = Font::get(FONT_SIZE_LARGE)); - virtual ~MenuComponent(); // just calls save(); + virtual ~MenuComponent(); void save(); void onSizeChanged() override; diff --git a/es-core/src/components/OptionListComponent.h b/es-core/src/components/OptionListComponent.h index 29f029f06..c608a6e55 100644 --- a/es-core/src/components/OptionListComponent.h +++ b/es-core/src/components/OptionListComponent.h @@ -366,8 +366,8 @@ private: }); } - mMenu.setPosition((Renderer::getScreenWidth() - mMenu.getSize().x()) / 2, - Renderer::getScreenHeight() * 0.15f); + mMenu.setPosition((Renderer::getScreenWidth() - mMenu.getSize().x()) / 2.0f, + Renderer::getScreenHeight() * 0.13f); addChild(&mMenu); }