Qt: Fix game list multi-selection after Refresh

Megamouse · Megamouse · commit 90df8baa5f29 · 2026-01-06T17:09:39.000+01:00
diff --git a/rpcs3/rpcs3qt/game_list_base.h b/rpcs3/rpcs3qt/game_list_base.h
@@ -15,7 +15,7 @@ class game_list_base
 		[[maybe_unused]] const std::vector<game_info>& game_data,
 		[[maybe_unused]] const std::map<QString, QString>& notes_map,
 		[[maybe_unused]] const std::map<QString, QString>& title_map,
-		[[maybe_unused]] const std::string& selected_item_id,
+		[[maybe_unused]] const std::set<std::string>& selected_item_ids,
 		[[maybe_unused]] bool play_hover_movies){};
 
 	void set_icon_size(QSize size) { m_icon_size = std::move(size); }
diff --git a/rpcs3/rpcs3qt/game_list_context_menu.cpp b/rpcs3/rpcs3qt/game_list_context_menu.cpp
@@ -581,7 +581,7 @@ void game_list_context_menu::show_single_selection_context_menu(const game_info&
 		Q_EMIT m_game_list_frame->RequestBoot(gameinfo, cfg_mode::global);
 	});
 
-	const auto configure_l = [this, current_game, gameinfo](bool create_cfg_from_global_cfg)
+	auto configure_l = [this, current_game, gameinfo](bool create_cfg_from_global_cfg)
 	{
 		settings_dialog dlg(m_gui_settings, m_emu_settings, 0, m_game_list_frame, &current_game, create_cfg_from_global_cfg);
 
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -446,7 +446,7 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri
 
 	// Fill Game List / Game Grid
 
-	const std::string selected_item = CurrentSelectionPath();
+	const std::set<std::string> selected_items = CurrentSelectionPaths();
 
 	// Release old data
 	for (const auto& game : m_game_data)
@@ -481,7 +481,7 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri
 	{
 		m_game_grid->clear_list();
 		const int scroll_position = m_game_list->verticalScrollBar()->value();
-		m_game_list->populate(matching_apps, m_notes, m_titles, selected_item, m_play_hover_movies);
+		m_game_list->populate(matching_apps, m_notes, m_titles, selected_items, m_play_hover_movies);
 		m_game_list->sort(m_game_data.size(), m_sort_column, m_col_sort_order);
 		RepaintIcons();
 
@@ -497,7 +497,7 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri
 	else
 	{
 		m_game_list->clear_list();
-		m_game_grid->populate(matching_apps, m_notes, m_titles, selected_item, m_play_hover_movies);
+		m_game_grid->populate(matching_apps, m_notes, m_titles, selected_items, m_play_hover_movies);
 		RepaintIcons();
 	}
 }
@@ -1257,38 +1257,37 @@ bool game_list_frame::SearchMatchesApp(const QString& name, const QString& seria
 	return true;
 }
 
-std::string game_list_frame::CurrentSelectionPath()
+std::set<std::string> game_list_frame::CurrentSelectionPaths()
 {
-	std::string selection;
-
-	game_info game{};
+	std::set<std::string> selection;
 
 	if (m_old_layout_is_list)
 	{
-		if (!m_game_list->selectedItems().isEmpty())
+		for (const QTableWidgetItem* selected_item : m_game_list->selectedItems())
 		{
-			if (QTableWidgetItem* item = m_game_list->item(m_game_list->currentRow(), 0))
+			if (const QTableWidgetItem* item = m_game_list->item(selected_item->row(), 0))
 			{
 				if (const QVariant var = item->data(gui::game_role); var.canConvert<game_info>())
 				{
-					game = var.value<game_info>();
+					if (const game_info game = var.value<game_info>())
+					{
+						selection.insert(game->info.path + game->info.icon_path);
+					}
 				}
 			}
 		}
 	}
 	else if (m_game_grid)
 	{
-		if (game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))
+		if (const game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))
 		{
-			game = item->game();
+			if (const game_info& game = item->game())
+			{
+				selection.insert(game->info.path + game->info.icon_path);
+			}
 		}
 	}
 
-	if (game)
-	{
-		selection = game->info.path + game->info.icon_path;
-	}
-
 	m_old_layout_is_list = m_is_list_layout;
 
 	return selection;
diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h
@@ -130,7 +130,7 @@ private Q_SLOTS:
 
 	bool SearchMatchesApp(const QString& name, const QString& serial, bool fallback = false) const;
 
-	std::string CurrentSelectionPath();
+	std::set<std::string> CurrentSelectionPaths();
 
 	game_info GetGameInfoByMode(const QTableWidgetItem* item) const;
 	static game_info GetGameInfoFromItem(const QTableWidgetItem* item);
diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp
@@ -40,7 +40,7 @@ void game_list_grid::populate(
 	const std::vector<game_info>& game_data,
 	const std::map<QString, QString>& notes_map,
 	const std::map<QString, QString>& title_map,
-	const std::string& selected_item_id,
+	const std::set<std::string>& selected_item_ids,
 	bool play_hover_movies)
 {
 	clear_list();
@@ -110,7 +110,7 @@ void game_list_grid::populate(
 			item->set_video_path(game->info.movie_path);
 		}
 
-		if (selected_item_id == game->info.path + game->info.icon_path)
+		if (selected_item_ids.contains(game->info.path + game->info.icon_path))
 		{
 			selected_item = item;
 		}
diff --git a/rpcs3/rpcs3qt/game_list_grid.h b/rpcs3/rpcs3qt/game_list_grid.h
@@ -18,7 +18,7 @@ class game_list_grid : public flow_widget, public game_list_base
 		const std::vector<game_info>& game_data,
 		const std::map<QString, QString>& notes_map,
 		const std::map<QString, QString>& title_map,
-		const std::string& selected_item_id,
+		const std::set<std::string>& selected_item_ids,
 		bool play_hover_movies) override;
 
 	void repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio) override;
diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp
@@ -204,7 +204,7 @@ void game_list_table::populate(
 	const std::vector<game_info>& game_data,
 	const std::map<QString, QString>& notes_map,
 	const std::map<QString, QString>& title_map,
-	const std::string& selected_item_id,
+	const std::set<std::string>& selected_item_ids,
 	bool play_hover_movies)
 {
 	clear_list();
@@ -219,7 +219,7 @@ void game_list_table::populate(
 
 	int row = 0;
 	int index = -1;
-	int selected_row = -1;
+	std::set<int> selected_rows;
 
 	const auto get_title = [&title_map](const QString& serial, const std::string& name) -> QString
 	{
@@ -378,15 +378,18 @@ void game_list_table::populate(
 		setItem(row, static_cast<int>(gui::game_list_columns::compat),     compat_item);
 		setItem(row, static_cast<int>(gui::game_list_columns::dir_size),   new custom_table_widget_item(game_size != umax ? gui::utils::format_byte_size(game_size) : tr("Unknown"), Qt::UserRole, QVariant::fromValue<qulonglong>(game_size)));
 
-		if (selected_item_id == game->info.path + game->info.icon_path)
+		if (selected_item_ids.contains(game->info.path + game->info.icon_path))
 		{
-			selected_row = row;
+			selected_rows.insert(row);
 		}
 
 		row++;
 	}
 
-	selectRow(selected_row);
+	for (int selected_row : selected_rows)
+	{
+		selectionModel()->select(model()->index(selected_row, 0), QItemSelectionModel::Select | QItemSelectionModel::Rows);
+	}
 }
 
 void game_list_table::repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio)
diff --git a/rpcs3/rpcs3qt/game_list_table.h b/rpcs3/rpcs3qt/game_list_table.h
@@ -28,7 +28,7 @@ class game_list_table : public game_list
 		const std::vector<game_info>& game_data,
 		const std::map<QString, QString>& notes_map,
 		const std::map<QString, QString>& title_map,
-		const std::string& selected_item_id,
+		const std::set<std::string>& selected_item_ids,
 		bool play_hover_movies) override;
 
 	void repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio) override;

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ void game_list_context_menu::show_single_selection_context_menu(const game_info&`
`581`	`581`	`Q_EMIT m_game_list_frame->RequestBoot(gameinfo, cfg_mode::global);`
`582`	`582`	`});`
`583`	`583`
`584`		`- const auto configure_l = [this, current_game, gameinfo](bool create_cfg_from_global_cfg)`
	`584`	`+ auto configure_l = [this, current_game, gameinfo](bool create_cfg_from_global_cfg)`
`585`	`585`	`{`
`586`	`586`	`settings_dialog dlg(m_gui_settings, m_emu_settings, 0, m_game_list_frame, &current_game, create_cfg_from_global_cfg);`
`587`	`587`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri`
`446`	`446`
`447`	`447`	`// Fill Game List / Game Grid`
`448`	`448`
`449`		`- const std::string selected_item = CurrentSelectionPath();`
	`449`	`+ const std::set<std::string> selected_items = CurrentSelectionPaths();`
`450`	`450`
`451`	`451`	`// Release old data`
`452`	`452`	`for (const auto& game : m_game_data)`
`@@ -481,7 +481,7 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri`
`481`	`481`	`{`
`482`	`482`	`m_game_grid->clear_list();`
`483`	`483`	`const int scroll_position = m_game_list->verticalScrollBar()->value();`
`484`		`- m_game_list->populate(matching_apps, m_notes, m_titles, selected_item, m_play_hover_movies);`
	`484`	`+ m_game_list->populate(matching_apps, m_notes, m_titles, selected_items, m_play_hover_movies);`
`485`	`485`	`m_game_list->sort(m_game_data.size(), m_sort_column, m_col_sort_order);`
`486`	`486`	`RepaintIcons();`
`487`	`487`
`@@ -497,7 +497,7 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri`
`497`	`497`	`else`
`498`	`498`	`{`
`499`	`499`	`m_game_list->clear_list();`
`500`		`- m_game_grid->populate(matching_apps, m_notes, m_titles, selected_item, m_play_hover_movies);`
	`500`	`+ m_game_grid->populate(matching_apps, m_notes, m_titles, selected_items, m_play_hover_movies);`
`501`	`501`	`RepaintIcons();`
`502`	`502`	`}`
`503`	`503`	`}`
`@@ -1257,38 +1257,37 @@ bool game_list_frame::SearchMatchesApp(const QString& name, const QString& seria`
`1257`	`1257`	`return true;`
`1258`	`1258`	`}`
`1259`	`1259`
`1260`		`-std::string game_list_frame::CurrentSelectionPath()`
	`1260`	`+std::set<std::string> game_list_frame::CurrentSelectionPaths()`
`1261`	`1261`	`{`
`1262`		`- std::string selection;`
`1263`		`-`
`1264`		`- game_info game{};`
	`1262`	`+ std::set<std::string> selection;`
`1265`	`1263`
`1266`	`1264`	`if (m_old_layout_is_list)`
`1267`	`1265`	`{`
`1268`		`- if (!m_game_list->selectedItems().isEmpty())`
	`1266`	`+ for (const QTableWidgetItem* selected_item : m_game_list->selectedItems())`
`1269`	`1267`	`{`
`1270`		`- if (QTableWidgetItem* item = m_game_list->item(m_game_list->currentRow(), 0))`
	`1268`	`+ if (const QTableWidgetItem* item = m_game_list->item(selected_item->row(), 0))`
`1271`	`1269`	`{`
`1272`	`1270`	`if (const QVariant var = item->data(gui::game_role); var.canConvert<game_info>())`
`1273`	`1271`	`{`
`1274`		`- game = var.value<game_info>();`
	`1272`	`+ if (const game_info game = var.value<game_info>())`
	`1273`	`+ {`
	`1274`	`+ selection.insert(game->info.path + game->info.icon_path);`
	`1275`	`+ }`
`1275`	`1276`	`}`
`1276`	`1277`	`}`
`1277`	`1278`	`}`
`1278`	`1279`	`}`
`1279`	`1280`	`else if (m_game_grid)`
`1280`	`1281`	`{`
`1281`		`- if (game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))`
	`1282`	`+ if (const game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))`
`1282`	`1283`	`{`
`1283`		`- game = item->game();`
	`1284`	`+ if (const game_info& game = item->game())`
	`1285`	`+ {`
	`1286`	`+ selection.insert(game->info.path + game->info.icon_path);`
	`1287`	`+ }`
`1284`	`1288`	`}`
`1285`	`1289`	`}`
`1286`	`1290`
`1287`		`- if (game)`
`1288`		`- {`
`1289`		`- selection = game->info.path + game->info.icon_path;`
`1290`		`- }`
`1291`		`-`
`1292`	`1291`	`m_old_layout_is_list = m_is_list_layout;`
`1293`	`1292`
`1294`	`1293`	`return selection;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void game_list_grid::populate(`
`40`	`40`	`const std::vector<game_info>& game_data,`
`41`	`41`	`const std::map<QString, QString>& notes_map,`
`42`	`42`	`const std::map<QString, QString>& title_map,`
`43`		`- const std::string& selected_item_id,`
	`43`	`+ const std::set<std::string>& selected_item_ids,`
`44`	`44`	`bool play_hover_movies)`
`45`	`45`	`{`
`46`	`46`	`clear_list();`
`@@ -110,7 +110,7 @@ void game_list_grid::populate(`
`110`	`110`	`item->set_video_path(game->info.movie_path);`
`111`	`111`	`}`
`112`	`112`
`113`		`- if (selected_item_id == game->info.path + game->info.icon_path)`
	`113`	`+ if (selected_item_ids.contains(game->info.path + game->info.icon_path))`
`114`	`114`	`{`
`115`	`115`	`selected_item = item;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ void game_list_table::populate(`
`204`	`204`	`const std::vector<game_info>& game_data,`
`205`	`205`	`const std::map<QString, QString>& notes_map,`
`206`	`206`	`const std::map<QString, QString>& title_map,`
`207`		`- const std::string& selected_item_id,`
	`207`	`+ const std::set<std::string>& selected_item_ids,`
`208`	`208`	`bool play_hover_movies)`
`209`	`209`	`{`
`210`	`210`	`clear_list();`
`@@ -219,7 +219,7 @@ void game_list_table::populate(`
`219`	`219`
`220`	`220`	`int row = 0;`
`221`	`221`	`int index = -1;`
`222`		`- int selected_row = -1;`
	`222`	`+ std::set<int> selected_rows;`
`223`	`223`
`224`	`224`	`const auto get_title = [&title_map](const QString& serial, const std::string& name) -> QString`
`225`	`225`	`{`
`@@ -378,15 +378,18 @@ void game_list_table::populate(`
`378`	`378`	`setItem(row, static_cast<int>(gui::game_list_columns::compat), compat_item);`
`379`	`379`	`setItem(row, static_cast<int>(gui::game_list_columns::dir_size), new custom_table_widget_item(game_size != umax ? gui::utils::format_byte_size(game_size) : tr("Unknown"), Qt::UserRole, QVariant::fromValue<qulonglong>(game_size)));`
`380`	`380`
`381`		`- if (selected_item_id == game->info.path + game->info.icon_path)`
	`381`	`+ if (selected_item_ids.contains(game->info.path + game->info.icon_path))`
`382`	`382`	`{`
`383`		`- selected_row = row;`
	`383`	`+ selected_rows.insert(row);`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`row++;`
`387`	`387`	`}`
`388`	`388`
`389`		`- selectRow(selected_row);`
	`389`	`+ for (int selected_row : selected_rows)`
	`390`	`+ {`
	`391`	`+ selectionModel()->select(model()->index(selected_row, 0), QItemSelectionModel::Select \| QItemSelectionModel::Rows);`
	`392`	`+ }`
`390`	`393`	`}`
`391`	`394`
`392`	`395`	`void game_list_table::repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio)`