OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1296 Multiselect in property panel lists using ctrl-click is vulnerable to mouse drag

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-24 22:40:57 +01:00
parent fcd2d96907
commit 7a89aee0bb
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
View File

@ -243,8 +243,13 @@ QWidget* PdmUiListEditor::createEditorWidget(QWidget * parent)
connect(m_listView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection& )), this, SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection& ))); connect(m_listView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection& )), this, SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection& )));
connect(m_model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(slotListItemEdited(const QModelIndex&, const QModelIndex&))); connect(m_model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(slotListItemEdited(const QModelIndex&, const QModelIndex&)));
// Used to track key press
m_listView->installEventFilter(this); m_listView->installEventFilter(this);
// Used to track mouse events
m_listView->viewport()->installEventFilter(this);
return m_listView; return m_listView;
} }
@ -370,9 +375,28 @@ void PdmUiListEditor::pasteFromString(const QString& content)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool PdmUiListEditor::eventFilter(QObject * listView, QEvent * event) bool PdmUiListEditor::eventFilter(QObject* object, QEvent * event)
{ {
if (listView == m_listView && event->type() == QEvent::KeyPress) if (object == m_listView->viewport() && event->type() == QEvent::MouseMove)
{
QMouseEvent* mouseEvent = dynamic_cast<QMouseEvent*>(event);
if (mouseEvent)
{
if (mouseEvent->buttons() & Qt::LeftButton
&& mouseEvent->modifiers() & Qt::ControlModifier)
{
// When Ctrl button is pressed, left mouse button is pressed, and the mouse is moving,
// a possible bug in Qt is observed causing the selection to end up with single item selection
// When returning here without doing anything, system behaves as expected
// NOTE: The mouse event is handled by the viewport() of the list view, not the list view itself
return true;
}
}
}
if (object == m_listView && event->type() == QEvent::KeyPress)
{ {
if (m_optionsOnly) return false; if (m_optionsOnly) return false;
CAF_ASSERT(m_options.isEmpty()); // Not supported yet CAF_ASSERT(m_options.isEmpty()); // Not supported yet