libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-08 19:00:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Add scrollToEntry() function in the grid

Browse Source
This commit is contained in:
av-dx 2021-08-12 23:15:45 +05:30 committed by Eugene Sandulenko
parent 9d1c12ff88
commit af969a48f3
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gui/widgets/grid.cpp
View File

@ -198,25 +198,10 @@ void GridItemWidget::handleMouseDown(int x, int y, int button, int clickCount) {
_grid->toggleGroup(_activeEntry->entryID);
} else if (_isHighlighted && isVisible()) {
_grid->_selectedEntry = _activeEntry;
sendCommand(kItemClicked, 0);
// Since user expected to click on "entry" and not the "widget", we
// must open the tray where the user expects it to be, which might
// not be at the new widget location.
// TODO: Make a scrollToSelection() function which does this
if (_y > (_grid->getHeight() - _h - _grid->_trayHeight)) {
int offsetY = _y - (_grid->getHeight() - _h - _grid->_trayHeight);
sendCommand(kSetPositionCmd, _grid->getScrollPos() + offsetY);
_grid->scrollBarRecalc();
_grid->markAsDirty();
_grid->draw();
}
sendCommand(kItemClicked, _activeEntry->entryID);
}
}
void GridItemWidget::handleMouseUp(int x, int y, int button, int clickCount) {
_grid->openTrayAtSelected();
}
#pragma mark -
GridItemTray::GridItemTray(GuiObject *boss, int x, int y, int w, int h, int entryID, GridWidget *grid)
@ -624,6 +609,32 @@ void GridWidget::move(int x, int y) {
}
}
// Scroll to entry id. Optional parameter to decide if the entry should be forced to be on the top, or merely
// scrolled into view.
void GridWidget::scrollToEntry(int id, bool forceToTop) {
int newScrollPos = _scrollPos;
for (uint i = 0; i < _sortedEntryList.size(); ++i) {
if ((!_sortedEntryList[i].isHeader) && (_sortedEntryList[i].entryID == id)) {
if (forceToTop) {
newScrollPos = _sortedEntryList[i].rect.top + _scrollWindowPaddingY + _gridYSpacing;
} else {
if (_sortedEntryList[i].rect.top < _scrollPos) {
// Item is above the visible view
newScrollPos = _sortedEntryList[i].rect.top - _scrollWindowPaddingY - _gridYSpacing;
} else if (_sortedEntryList[i].rect.top > _scrollPos + _scrollWindowHeight - _gridItemHeight - _trayHeight) {
// Item is below the visible view
newScrollPos = _sortedEntryList[i].rect.top - _scrollWindowHeight + _gridItemHeight + _trayHeight;
} else {
// Item already in view, do nothing
newScrollPos = _scrollPos;
}
}
break;
}
}
handleCommand(this, kSetPositionCmd, newScrollPos);
}
void GridWidget::updateGrid() {
for (Common::Array<GridItemWidget *>::iterator i = _gridItems.begin(); i != _gridItems.end(); ++i) {
(*i)->update();
@ -682,11 +693,18 @@ void GridWidget::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
}
assignEntriesToItems();
scrollBarRecalc();
markAsDirty();
((GUI::Dialog *)_boss)->setFocusWidget(this);
}
break;
case kItemClicked:
scrollToEntry(data, false);
// Redraw the grid, before we open the tray dialog
draw();
openTrayAtSelected();
// Fallthrough is intentional
default:
sendCommand(cmd, 0);
break;

2
gui/widgets/grid.h
View File

@ -193,6 +193,7 @@ public:
void calcEntrySizes();
void updateGrid();
void move(int x, int y);
void scrollToEntry(int id, bool forceToTop);
void assignEntriesToItems();
int getScrollPos() const { return _scrollPos; }
@ -233,7 +234,6 @@ public:
void handleMouseEntered(int button) override;
void handleMouseLeft(int button) override;
void handleMouseDown(int x, int y, int button, int clickCount) override;
void handleMouseUp(int x, int y, int button, int clickCount) override;
void handleMouseMoved(int x, int y, int button) override;
};