selection: fix row selection when sorted

ossia · Feb 11, 2025 · f8d6551 · f8d6551
1 parent a365ffb
commit f8d6551
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/plugins/score-plugin-packagemanager/PackageManager/Model.cpp b/src/plugins/score-plugin-packagemanager/PackageManager/Model.cpp
@@ -21,7 +21,6 @@ PluginSettingsModel::PluginSettingsModel(
     QSettings& set, const score::ApplicationContext& ctx)
     : score::SettingsDelegateModel{}
     , localPlugins{ctx}
-    , remoteSelection{&remotePlugins}
 {
 }
 

diff --git a/src/plugins/score-plugin-packagemanager/PackageManager/Model.hpp b/src/plugins/score-plugin-packagemanager/PackageManager/Model.hpp
@@ -1,8 +1,6 @@
 #pragma once
 #include <score/plugins/settingsdelegate/SettingsDelegateModel.hpp>
 
-#include <QItemSelectionModel>
-
 #include <PackageManager/PluginItemModel.hpp>
 
 class QAbstractItemModel;
@@ -19,6 +17,5 @@ class PluginSettingsModel : public score::SettingsDelegateModel
 
   LocalPackagesModel localPlugins;
   RemotePackagesModel remotePlugins;
-  QItemSelectionModel remoteSelection;
 };
 }
diff --git a/src/plugins/score-plugin-packagemanager/PackageManager/Presenter.cpp b/src/plugins/score-plugin-packagemanager/PackageManager/Presenter.cpp
@@ -12,6 +12,7 @@
 #include <QApplication>
 #include <QDebug>
 #include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QListView>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
@@ -65,14 +66,17 @@ PluginSettingsPresenter::PluginSettingsPresenter(
   ps_view.remoteView()->setColumnWidth(4, 30);
   ps_view.remoteView()->horizontalHeader()->setStretchLastSection(true);
 
-  // ps_view.remoteView()->setSelectionModel(&ps_model.remoteSelection);
+  auto selection = new QItemSelectionModel{remoteProxyModel, this};
+  ps_view.remoteView()->setSelectionModel(selection);
   connect(
-      &ps_model.remoteSelection, &QItemSelectionModel::currentRowChanged, this,
-      [&](const QModelIndex& current, const QModelIndex& previous) {
-    Package& addon = ps_model.remotePlugins.addons().at(current.row());
+      selection, &QItemSelectionModel::currentRowChanged, this,
+      [remoteProxyModel, &ps_model,
+       &ps_view](const QModelIndex& current, const QModelIndex& previous) {
+    auto selected = remoteProxyModel->mapToSource(current);
+    Package& addon = ps_model.remotePlugins.addons().at(selected.row());
 
     ps_view.installButton().setEnabled(!addon.files.empty() || addon.kind == "sdk");
-      });
+  });
 
   ps_view.installButton().setEnabled(false);
 

diff --git a/src/plugins/score-plugin-packagemanager/PackageManager/View.cpp b/src/plugins/score-plugin-packagemanager/PackageManager/View.cpp
@@ -443,7 +443,6 @@ namespace PM
 
   void PluginSettingsView::checkAll()
   {
-
     std::vector<Package*> to_update;
     for(auto& addon : m_localModel->addons())
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -443,7 +443,6 @@ namespace PM @@
       void PluginSettingsView::checkAll()
       {
         std::vector<Package*> to_update;
         for(auto& addon : m_localModel->addons())
         {
@@ Expand Down @@