GH-2101 fix enter and double click activation of instances

MultiMC · Nov 22, 2018 · 74c598d · 74c598d
1 parent c214c13
commit 74c598d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
@@ -692,7 +692,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
         setCatBackground(cat_enable);
     }
     // start instance when double-clicked
-    connect(view, &GroupView::doubleClicked, this, &MainWindow::instanceActivated);
+    connect(view, &GroupView::activated, this, &MainWindow::instanceActivated);
 
     // track the selection -- update the instance toolbar
     connect(view->selectionModel(), &QItemSelectionModel::currentChanged, this, &MainWindow::instanceChanged);

diff --git a/application/groupview/GroupView.cpp b/application/groupview/GroupView.cpp
@@ -417,6 +417,12 @@ void GroupView::mouseDoubleClickEvent(QMouseEvent *event)
     // signal handlers may change the model
     QPersistentModelIndex persistent = index;
     emit doubleClicked(persistent);
+
+    QStyleOptionViewItem option = viewOptions();
+    if ((model()->flags(index) & Qt::ItemIsEnabled) && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this))
+    {
+        emit activated(index);
+    }
 }
 
 void GroupView::paintEvent(QPaintEvent *event)