From b94ad4d8b80c6c951ffd66b0aa426aade5e17ffd Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 29 May 2022 18:38:46 +0200
Subject: [PATCH] GUI: Implement setSelected in Grid and use it in launcher

---
 gui/launcher.cpp     | 24 +++++++++++++++++++++++-
 gui/widgets/grid.cpp | 10 ++++++++++
 gui/widgets/grid.h   |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 80c8348be5e..68971ab7862 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1540,8 +1540,18 @@ void LauncherGrid::updateListing() {
 		gridList.push_back(GridItemInfo(k++, engineid, gameid, iter->title, iter->description, Common::parseLanguage(language), Common::parsePlatform(platform)));
 	}
 
+	const int oldSel = _grid->getSelected();
+
 	_grid->setEntryList(&gridList);
 	groupEntries(attrs);
+
+	if (oldSel < (int)gridList.size() && oldSel >= 0)
+		_grid->setSelected(oldSel);	// Restore the old selection
+	else if (oldSel != -1)
+		// Select the last entry if the list has been reduced
+		_grid->setSelected(gridList.size() - 1);
+	updateButtons();
+
 	// And fill out our structures
 	for (Common::Array<LauncherEntry>::const_iterator iter = domainList.begin(); iter != domainList.end(); ++iter) {
 		_domains.push_back(iter->key);
@@ -1556,7 +1566,19 @@ void LauncherGrid::updateButtons() {
 	}
 }
 
-void LauncherGrid::selectTarget(const Common::String &target) {}
+void LauncherGrid::selectTarget(const Common::String &target) {
+	if (!target.empty()) {
+		int itemToSelect = 0;
+		Common::StringArray::const_iterator iter;
+		for (iter = _domains.begin(); iter != _domains.end(); ++iter, ++itemToSelect) {
+			if (target == *iter) {
+				_grid->setSelected(itemToSelect);
+				break;
+			}
+		}
+	}
+}
+
 int LauncherGrid::getSelected() { return _grid->getSelected(); }
 
 void LauncherGrid::build() {
diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index 83158916afc..0acc9e9e85f 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -947,4 +947,14 @@ void GridWidget::setFilter(const Common::U32String &filter) {
 	sortGroups();
 }
 
+void GridWidget::setSelected(int id) {
+	for (uint i = 0; i < _sortedEntryList.size(); ++i) {
+		if ((!_sortedEntryList[i]->isHeader) && (_sortedEntryList[i]->entryID == id)) {
+			_selectedEntry = _sortedEntryList[i];
+			scrollToEntry(id, false);
+			break;
+		}
+	}
+}
+
 } // End of namespace GUI
diff --git a/gui/widgets/grid.h b/gui/widgets/grid.h
index 0a5a656a927..01cfed28783 100644
--- a/gui/widgets/grid.h
+++ b/gui/widgets/grid.h
@@ -209,6 +209,7 @@ public:
 	void openTrayAtSelected();
 	void scrollBarRecalc();
 
+	void setSelected(int id);
 	void setFilter(const Common::U32String &filter);
 };