patch_manager: make patches selectable by double click

2025-12-06 07:12:28 +01:00 · 2025-08-19 22:46:00 +02:00 · 2025-08-19 22:46:00 +02:00 · ce4edf9cb1
parent d72f95677e
commit ce4edf9cb1
5 changed files with 83 additions and 18 deletions
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@ -1374,6 +1374,7 @@
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
    </CustomBuild>
+    <ClInclude Include="rpcs3qt\custom_tree_widget.h" />
    <ClInclude Include="rpcs3qt\emu_settings_type.h" />
    <CustomBuild Include="rpcs3qt\render_creator.h">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@ -1439,6 +1439,9 @@
    <ClInclude Include="gamemode_control.h">
      <Filter>rpcs3</Filter>
    </ClInclude>
+    <ClInclude Include="rpcs3qt\custom_tree_widget.h">
+      <Filter>Gui\widgets</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="resource.h">
--- a/rpcs3/rpcs3qt/custom_tree_widget.h
+++ b/rpcs3/rpcs3qt/custom_tree_widget.h
@ -0,0 +1,48 @@
+#pragma once
+
+#include <QTreeWidget>
+#include <QMouseEvent>
+
+// Allows to double click the items in order to de/select them
+class custom_tree_widget : public QTreeWidget
+{
+	using QTreeWidget::QTreeWidget;
+
+public:
+	void set_checkable_by_double_click_callback(std::function<bool(QTreeWidgetItem*, int)> cb)
+	{
+		m_checkable_by_dc_cb = std::move(cb);
+	}
+
+	void mouseDoubleClickEvent(QMouseEvent* event)
+	{
+		QTreeWidget::mouseDoubleClickEvent(event);
+
+		if (!event || !m_checkable_by_dc_cb) return;
+
+		const QPoint pos = event->pos();
+		QTreeWidgetItem* item = itemAt(pos);
+
+		if (!item || !(item->flags() & Qt::ItemIsUserCheckable)) return;
+
+		const int column = columnAt(pos.x());
+		if (!m_checkable_by_dc_cb(item, column)) return;
+
+		const QModelIndex index = indexFromItem(item, column);
+		if (!index.isValid()) return;
+
+		QStyleOptionViewItem option;
+		option.initFrom(this);
+		option.rect = visualRect(index);
+		option.features = QStyleOptionViewItem::HasCheckIndicator;
+
+		const QRect checkbox_region = style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &option, this);
+		if (checkbox_region.contains(pos)) return;
+
+		const Qt::CheckState current_state = item->checkState(column);
+		item->setCheckState(column, (current_state == Qt::CheckState::Checked) ? Qt::CheckState::Unchecked : Qt::CheckState::Checked);
+	}
+
+private:
+	std::function<bool(QTreeWidgetItem*, int)> m_checkable_by_dc_cb;
+};
--- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp
@ -95,6 +95,12 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
 	ui->configurable_double_spin_box->setEnabled(false);
 	ui->configurable_double_spin_box->setVisible(false);

+	// Allow to double click the patches in order to de/select them
+	ui->patch_tree->set_checkable_by_double_click_callback([](QTreeWidgetItem* item, int column)
+	{
+		return item && !item->isDisabled() && (item->flags() & Qt::ItemIsUserCheckable) && static_cast<node_level>(item->data(column, node_level_role).toInt()) == node_level::patch_level;
+	});
+
 	// Create connects
 	connect(ui->patch_filter, &QLineEdit::textChanged, this, &patch_manager_dialog::filter_patches);
 	connect(ui->patch_tree, &QTreeWidget::currentItemChanged, this, &patch_manager_dialog::handle_item_selected);
--- a/rpcs3/rpcs3qt/patch_manager_dialog.ui
+++ b/rpcs3/rpcs3qt/patch_manager_dialog.ui
@ -20,7 +20,7 @@
   <item>
    <widget class="QSplitter" name="splitter">
     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
     </property>
     <widget class="QWidget" name="verticalLayoutWidget">
      <layout class="QVBoxLayout" name="patch_tree_layout">
@ -49,9 +49,9 @@
        </layout>
       </item>
       <item>
-        <widget class="QTreeWidget" name="patch_tree">
+        <widget class="custom_tree_widget" name="patch_tree">
         <property name="contextMenuPolicy">
-          <enum>Qt::CustomContextMenu</enum>
+          <enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
         </property>
         <property name="indentation">
          <number>20</number>
@ -70,10 +70,10 @@
     </widget>
     <widget class="QScrollArea" name="scrollArea">
      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
      </property>
      <property name="sizeAdjustPolicy">
-       <enum>QAbstractScrollArea::AdjustToContents</enum>
+       <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
      </property>
      <property name="widgetResizable">
       <bool>true</bool>
@ -121,7 +121,7 @@
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -143,7 +143,7 @@
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -162,7 +162,7 @@
                 <string/>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -184,7 +184,7 @@
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -206,7 +206,7 @@
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -228,7 +228,7 @@
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -250,7 +250,7 @@
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -269,13 +269,13 @@
                 <string/>
                </property>
                <property name="alignment">
-                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                 <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>
                </property>
                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
                </property>
               </widget>
              </item>
@ -324,10 +324,10 @@
           <item>
            <spacer name="verticalSpacerPatchInfo">
             <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeType">
-              <enum>QSizePolicy::MinimumExpanding</enum>
+              <enum>QSizePolicy::Policy::MinimumExpanding</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@ -348,12 +348,19 @@
   <item>
    <widget class="QDialogButtonBox" name="buttonBox">
     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
+      <set>QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
     </property>
    </widget>
   </item>
  </layout>
 </widget>
+ <customwidgets>
+  <customwidget>
+   <class>custom_tree_widget</class>
+   <extends>QTreeWidget</extends>
+   <header>rpcs3qt/custom_tree_widget.h</header>
+  </customwidget>
+ </customwidgets>
 <resources/>
 <connections/>
 </ui>