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

Fixed a GUI element placement issue on high resolution displays.

Browse source
This commit is contained in:
Leon Styhre 2021-01-14 18:24:41 +01:00
parent 82896f01fb
commit fbb78add20
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
es-core/src/components/OptionListComponent.h
View file

@ -40,7 +40,7 @@ public:
mHelpStyle(helpstyle), mHelpStyle(helpstyle),
mMultiSelect(multiSelect), mMultiSelect(multiSelect),
mName(name), mName(name),
mText(window), mText(window),
mLeftArrow(window), mLeftArrow(window),
mRightArrow(window) mRightArrow(window)
{ {
@ -76,7 +76,7 @@ public:
mRightArrow.setResize(0, mText.getFont()->getLetterHeight()); mRightArrow.setResize(0, mText.getFont()->getLetterHeight());
if (mSize.x() < (mLeftArrow.getSize().x() + mRightArrow.getSize().x())) { if (mSize.x() < (mLeftArrow.getSize().x() + mRightArrow.getSize().x())) {
LOG(LogWarning) << "OptionListComponent too narrow!"; LOG(LogWarning) << "OptionListComponent too narrow";
} }
mText.setSize(mSize.x() - mLeftArrow.getSize().x() - mText.setSize(mSize.x() - mLeftArrow.getSize().x() -
@ -240,24 +240,26 @@ private:
void onSelectedChanged() void onSelectedChanged()
{ {
if (mMultiSelect) { if (mMultiSelect) {
// Display # selected. // Display the selected entry.
std::stringstream ss; std::stringstream ss;
ss << getSelectedObjects().size() << " SELECTED"; ss << getSelectedObjects().size() << " SELECTED";
mText.setText(ss.str()); mText.setText(ss.str());
mText.setSize(0, mText.getSize().y()); mText.setSize(0, mText.getSize().y());
setSize(mText.getSize().x() + mRightArrow.getSize().x() + 24, mText.getSize().y()); setSize(mText.getSize().x() + mRightArrow.getSize().x() +
if (mParent) // Hack since theres no "on child size changed" callback atm... 24 * Renderer::getScreenWidthModifier(), mText.getSize().y());
if (mParent) // Hack since there's no "on child size changed" callback.
mParent->onSizeChanged(); mParent->onSizeChanged();
} }
else { else {
// Display currently selected + l/r cursors. // Display the selected entry and left/right option arrows.
for (auto it = mEntries.cbegin(); it != mEntries.cend(); it++) { for (auto it = mEntries.cbegin(); it != mEntries.cend(); it++) {
if (it->selected) { if (it->selected) {
mText.setText(Utils::String::toUpper(it->name)); mText.setText(Utils::String::toUpper(it->name));
mText.setSize(0, mText.getSize().y()); mText.setSize(0, mText.getSize().y());
setSize(mText.getSize().x() + mLeftArrow.getSize().x() + setSize(mText.getSize().x() + mLeftArrow.getSize().x() +
mRightArrow.getSize().x() + 24, mText.getSize().y()); mRightArrow.getSize().x() +
if (mParent) // Hack since theres no "on child size changed" callback atm... 24 * Renderer::getScreenWidthModifier(), mText.getSize().y());
if (mParent) // Hack since there's no "on child size changed" callback.
mParent->onSizeChanged(); mParent->onSizeChanged();
break; break;
} }
@ -301,7 +303,7 @@ private:
auto font = Font::get(FONT_SIZE_MEDIUM); auto font = Font::get(FONT_SIZE_MEDIUM);
ComponentListRow row; ComponentListRow row;
// For select all/none. // For selecting all/none.
std::vector<ImageComponent*> checkboxes; std::vector<ImageComponent*> checkboxes;
for (auto it = mParent->mEntries.begin(); it != mParent->mEntries.end(); it++) { for (auto it = mParent->mEntries.begin(); it != mParent->mEntries.end(); it++) {
@ -319,14 +321,14 @@ private:
row.addElement(checkbox, false); row.addElement(checkbox, false);
// Input handler. // Input handler.
// Update checkbox state & selected value. // Update checkbox state and selected value.
row.makeAcceptInputHandler([this, &e, checkbox] { row.makeAcceptInputHandler([this, &e, checkbox] {
e.selected = !e.selected; e.selected = !e.selected;
checkbox->setImage(e.selected ? CHECKED_PATH : UNCHECKED_PATH); checkbox->setImage(e.selected ? CHECKED_PATH : UNCHECKED_PATH);
mParent->onSelectedChanged(); mParent->onSelectedChanged();
}); });
// For select all/none. // For selecting all/none.
checkboxes.push_back(checkbox.get()); checkboxes.push_back(checkbox.get());
} }
else { else {