Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 15:15:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed an unnecessary column from MenuComponent and adjusted the scroll indicators.

Browse source
This commit is contained in:
Leon Styhre 2021-10-14 22:38:30 +02:00
parent 6ccee6e4c4
commit 7311a49f82
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
es-core/src/components/MenuComponent.cpp
View file

@ -21,7 +21,7 @@ MenuComponent::MenuComponent(Window* window,
const std::shared_ptr<Font>& titleFont) const std::shared_ptr<Font>& titleFont)
: GuiComponent(window) : GuiComponent(window)
, mBackground(window) , mBackground(window)
, mGrid(window, glm::ivec2{3, 4}) , mGrid(window, glm::ivec2{2, 4})
, mNeedsSaving(false) , mNeedsSaving(false)
{ {
addChild(&mBackground); addChild(&mBackground);
@ -34,11 +34,11 @@ MenuComponent::MenuComponent(Window* window,
mTitle->setHorizontalAlignment(ALIGN_CENTER); mTitle->setHorizontalAlignment(ALIGN_CENTER);
mTitle->setColor(0x555555FF); mTitle->setColor(0x555555FF);
setTitle(title, titleFont); setTitle(title, titleFont);
mGrid.setEntry(mTitle, glm::ivec2{0, 0}, false, true, glm::ivec2{3, 2}); mGrid.setEntry(mTitle, glm::ivec2{0, 0}, false, true, glm::ivec2{2, 2});
// Set up list which will never change (externally, anyway). // Set up list which will never change (externally, anyway).
mList = std::make_shared<ComponentList>(mWindow); mList = std::make_shared<ComponentList>(mWindow);
mGrid.setEntry(mList, glm::ivec2{0, 2}, true, true, glm::ivec2{3, 1}); mGrid.setEntry(mList, glm::ivec2{0, 2}, true, true, glm::ivec2{2, 1});
// Set up scroll indicators. // Set up scroll indicators.
mScrollUp = std::make_shared<ImageComponent>(mWindow); mScrollUp = std::make_shared<ImageComponent>(mWindow);
@ -51,8 +51,8 @@ MenuComponent::MenuComponent(Window* window,
mScrollDown->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f); mScrollDown->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollDown->setOrigin(0.0f, 0.35f); mScrollDown->setOrigin(0.0f, 0.35f);
mGrid.setEntry(mScrollUp, glm::ivec2{2, 0}, false, false, glm::ivec2{1, 1}); mGrid.setEntry(mScrollUp, glm::ivec2{1, 0}, false, false, glm::ivec2{1, 1});
mGrid.setEntry(mScrollDown, glm::ivec2{2, 1}, false, false, glm::ivec2{1, 1}); mGrid.setEntry(mScrollDown, glm::ivec2{1, 1}, false, false, glm::ivec2{1, 1});
updateGrid(); updateGrid();
updateSize(); updateSize();
@ -127,8 +127,7 @@ void MenuComponent::onSizeChanged()
mGrid.setRowHeightPerc(1, TITLE_HEIGHT / mSize.y / 2.0f); mGrid.setRowHeightPerc(1, TITLE_HEIGHT / mSize.y / 2.0f);
mGrid.setRowHeightPerc(3, getButtonGridHeight() / mSize.y); mGrid.setRowHeightPerc(3, getButtonGridHeight() / mSize.y);
mGrid.setColWidthPerc(0, 0.07f); mGrid.setColWidthPerc(1, 0.055f);
mGrid.setColWidthPerc(2, 0.07f);
mGrid.setSize(mSize); mGrid.setSize(mSize);
} }
@ -152,7 +151,7 @@ void MenuComponent::updateGrid()
if (mButtons.size()) { if (mButtons.size()) {
mButtonGrid = makeButtonGrid(mWindow, mButtons); mButtonGrid = makeButtonGrid(mWindow, mButtons);
mGrid.setEntry(mButtonGrid, glm::ivec2{0, 3}, true, false, glm::ivec2{3, 1}); mGrid.setEntry(mButtonGrid, glm::ivec2{0, 3}, true, false, glm::ivec2{2, 1});
} }
} }