From 9ab4e4d70c1cb9f0a8e2355f516d210b3ba0027d Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Mon, 21 Jul 2025 05:05:04 -0400
Subject: [PATCH] Qt: Add game list button to toggle game icons (#3488)

---
 src/duckstation-qt/gamelistwidget.cpp |  8 +++++---
 src/duckstation-qt/gamelistwidget.ui  | 25 ++++++++++++++++++++++---
 src/duckstation-qt/mainwindow.ui      |  6 ++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/duckstation-qt/gamelistwidget.cpp b/src/duckstation-qt/gamelistwidget.cpp
index 0c2f22434..3972cbfd2 100644
--- a/src/duckstation-qt/gamelistwidget.cpp
+++ b/src/duckstation-qt/gamelistwidget.cpp
@@ -1192,8 +1192,9 @@ void GameListWidget::initialize(QAction* actionGameList, QAction* actionGameGrid
 
   m_ui.viewGameList->setDefaultAction(actionGameList);
   m_ui.viewGameGrid->setDefaultAction(actionGameGrid);
-  m_ui.viewMergeDiscSets->setDefaultAction(actionMergeDiscSets);
-  m_ui.viewGridTitles->setDefaultAction(actionGridShowTitles);
+  m_ui.mergeDiscSets->setDefaultAction(actionMergeDiscSets);
+  m_ui.showGameIcons->setDefaultAction(actionListShowIcons);
+  m_ui.showGridTitles->setDefaultAction(actionGridShowTitles);
 
   connect(m_ui.gridScale, &QSlider::valueChanged, m_grid_view, &GameListGridView::setZoomPct);
   connect(m_ui.filterType, &QComboBox::currentIndexChanged, this, [this](int index) {
@@ -1502,7 +1503,8 @@ void GameListWidget::updateView(bool grid_view)
 
 void GameListWidget::updateToolbar(bool grid_view)
 {
-  m_ui.viewGridTitles->setVisible(grid_view);
+  m_ui.showGameIcons->setVisible(!grid_view);
+  m_ui.showGridTitles->setVisible(grid_view);
   m_ui.gridScale->setVisible(grid_view);
 }
 
diff --git a/src/duckstation-qt/gamelistwidget.ui b/src/duckstation-qt/gamelistwidget.ui
index 30ee5fbc6..4ed5b8920 100644
--- a/src/duckstation-qt/gamelistwidget.ui
+++ b/src/duckstation-qt/gamelistwidget.ui
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,1,0,0,0">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,1,0,0,0">
      <property name="spacing">
       <number>3</number>
      </property>
@@ -82,7 +82,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="viewMergeDiscSets">
+      <widget class="QToolButton" name="mergeDiscSets">
        <property name="minimumSize">
         <size>
          <width>32</width>
@@ -101,7 +101,26 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="viewGridTitles">
+      <widget class="QToolButton" name="showGameIcons">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Show Game Icons</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="showGridTitles">
        <property name="minimumSize">
         <size>
          <width>32</width>
diff --git a/src/duckstation-qt/mainwindow.ui b/src/duckstation-qt/mainwindow.ui
index 93cd7129b..22d81fce0 100644
--- a/src/duckstation-qt/mainwindow.ui
+++ b/src/duckstation-qt/mainwindow.ui
@@ -939,9 +939,15 @@
    <property name="checked">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset theme="image-fill"/>
+   </property>
    <property name="text">
     <string>Show Game Icons (List View)</string>
    </property>
+   <property name="toolTip">
+    <string>Show Game Icons</string>
+   </property>
   </action>
   <action name="actionMediaCapture">
    <property name="checkable">