From 74c598d756107be817989d87bd4ccf9d1a182e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 22 Nov 2018 02:02:53 +0100 Subject: [PATCH] GH-2101 fix enter and double click activation of instances --- application/MainWindow.cpp | 2 +- application/groupview/GroupView.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 66e1f141b8..78b0a9073a 100644 --- 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 index a1b44e6447..e61ac89872 100644 --- 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)