Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added proper helpsystem handling to ComponentGrid for some previously unhandled horizontal grid layouts

Browse source
This commit is contained in:
Leon Styhre 2023-03-31 20:33:38 +02:00
parent e6aa3b17fb
commit 8ab9bacc9d
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
es-core/src/components/ComponentGrid.cpp
View file

@ -495,10 +495,21 @@ std::vector<HelpPrompt> ComponentGrid::getHelpPrompts()
}
}
// There is currently no situation in the application where unfocusable cells are located
// next to each other horizontally, so this code is good enough. If this changes in the
// future, code similar to the the vertical cell handling above needs to be added.
bool canScrollHoriz {mGridSize.x > 1 && e->dim.x < mGridSize.x};
bool canScrollHoriz {false};
// Same as the above code section but for the X axis.
if (mGridSize.x > 1 && e->dim.x < mGridSize.x) {
if (e->pos.x - e->dim.x >= 0) {
const GridEntry* cell {getCellAt(glm::ivec2 {e->pos.x - e->dim.x, e->pos.y})};
if (cell != nullptr && cell->canFocus)
canScrollHoriz = true;
}
if (e->pos.x + e->dim.x < mGridSize.x) {
const GridEntry* cell {getCellAt(glm::ivec2 {e->pos.x + e->dim.x, e->pos.y})};
if (cell != nullptr && cell->canFocus)
canScrollHoriz = true;
}
}
// Check existing capabilities as indicated by the help prompts, and if the prompts should
// be combined into "up/down/left/right" then also remove the single-axis prompts.