summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-09-20 22:01:31 +0300
committerOrgad Shaneh <orgads@gmail.com>2016-09-21 10:42:12 +0000
commit5305a58a51476c31ff626316325a30d573dc561f (patch)
treef47ea12eb4783529165c1d114982cd2f2e9b90bf
parent67cf72e377c320d653c0c0340699f322c981a50f (diff)
downloadqt-creator-5305a58a51476c31ff626316325a30d573dc561f.tar.gz
TreeView: Set current index by selection
... on KeyPress event and others. This fixes e.g. deleting a watch expression by pressing the Delete key. Change-Id: Ie0eabf20fb4aeee8349d0282aa4378835d07bc43 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/libs/utils/basetreeview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
index 792ea68641..8522934d35 100644
--- a/src/libs/utils/basetreeview.cpp
+++ b/src/libs/utils/basetreeview.cpp
@@ -417,6 +417,7 @@ void BaseTreeView::setSettings(QSettings *settings, const QByteArray &key)
ItemViewEvent::ItemViewEvent(QEvent *ev, QAbstractItemView *view)
: m_event(ev), m_view(view)
{
+ QItemSelectionModel *selection = view->selectionModel();
switch (ev->type()) {
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
@@ -435,10 +436,10 @@ ItemViewEvent::ItemViewEvent(QEvent *ev, QAbstractItemView *view)
m_index = view->indexAt(m_pos);
break;
default:
+ m_index = selection->currentIndex();
break;
}
- QItemSelectionModel *selection = view->selectionModel();
m_selectedRows = selection->selectedRows();
if (m_selectedRows.isEmpty()) {
QModelIndex current = selection->currentIndex();