[Scummvm-git-logs] scummvm master -> 98242e4f2f72af5d750bbd0b0e8748b67613c980

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
34e2f9ac39 GUI: Use standard hotkeys in RemovalConfirmationDialog
98242e4f2f GUI: Use MessageDialog when removing a single game


Commit: 34e2f9ac397c0b855ebb3ccba8a1495bc6ecae5e
    https://github.com/scummvm/scummvm/commit/34e2f9ac397c0b855ebb3ccba8a1495bc6ecae5e
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2026-03-25T11:34:45+02:00

Commit Message:
GUI: Use standard hotkeys in RemovalConfirmationDialog

Changed paths:
    gui/launcher.cpp


diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 27e817959d3..13523c04248 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1910,8 +1910,8 @@ RemovalConfirmationDialog::RemovalConfirmationDialog(const Common::U32String &me
 	}
 
 	// Create Button Widgets with bogus size (will be sized in reflowLayout)
-	_buttons.push_back(new ButtonWidget(this, 0, 0, 0, 0, Common::U32String(_("Yes")), Common::U32String(), kRemovalYes, 'y'));
-	_buttons.push_back(new ButtonWidget(this, 0, 0, 0, 0, Common::U32String(_("No")), Common::U32String(), kRemovalNo, 'n'));
+	_buttons.push_back(new ButtonWidget(this, 0, 0, 0, 0, Common::U32String(_("Yes")), Common::U32String(), kRemovalYes, Common::ASCII_RETURN));
+	_buttons.push_back(new ButtonWidget(this, 0, 0, 0, 0, Common::U32String(_("No")), Common::U32String(), kRemovalNo, Common::ASCII_ESCAPE));
 
 	reflowLayout();
 }


Commit: 98242e4f2f72af5d750bbd0b0e8748b67613c980
    https://github.com/scummvm/scummvm/commit/98242e4f2f72af5d750bbd0b0e8748b67613c980
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2026-03-25T11:34:45+02:00

Commit Message:
GUI: Use MessageDialog when removing a single game

Changed paths:
    gui/launcher.cpp


diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 13523c04248..a33b27f57e0 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1824,10 +1824,6 @@ void LauncherGrid::updateSelectionAfterRemoval() {
 #endif // !DISABLE_LAUNCHERDISPLAY_GRID
 
 void LauncherDialog::confirmRemoveGames(const Common::Array<bool> &selectedItems) {
-	// Validate that at least one item is selected
-	if (!hasAnySelection(selectedItems))
-		return;
-
 	// Count selected items
 	int selectedCount = 0;
 	for (int i = 0; i < (int)selectedItems.size(); ++i) {
@@ -1836,9 +1832,24 @@ void LauncherDialog::confirmRemoveGames(const Common::Array<bool> &selectedItems
 		}
 	}
 
+	// Validate that at least one item is selected
+	if (selectedCount == 0) {
+		return;
+	}
+
+	// Use standard message box if only one item is selected
+	if (selectedCount == 1) {
+		for (int i = 0; i < (int)selectedItems.size(); ++i) {
+			if (selectedItems[i]) {
+				removeGame(i);
+				return;
+			}
+		}
+	}
+
 	// Build the confirmation message with count
 	Common::U32String message = Common::U32String::format(
-		_("Do you really want to remove the following %d game configuration(s)?\n\n"),
+		_("Do you really want to remove the following %d game configurations?\n\n"),
 		selectedCount);
 
 	// Build array of game titles to display
@@ -1860,9 +1871,6 @@ void LauncherDialog::confirmRemoveGames(const Common::Array<bool> &selectedItems
 }
 
 void LauncherDialog::removeGames(const Common::Array<bool> &selectedItems, bool isGrid) {
-	if (selectedItems.empty())
-		return;
-
 	// Check if any items are selected
 	if (!hasAnySelection(selectedItems))
 		return;