OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

AppFwk: Do not toggle item when tree item editor widget (QLineEdit) is closed with Enter key

Browse Source
This commit is contained in:
Magne Sjaastad
2016-07-25 18:25:14 +02:00
parent fa19a74dcc
commit 512f8904de
5 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/UserInterface/RiuTreeViewEventFilter.cpp
View File

@@ -101,17 +101,20 @@ bool RiuTreeViewEventFilter::eventFilter(QObject *obj, QEvent *event)
return true;
}
switch (keyEvent->key())
if (!RiuMainWindow::instance()->projectTreeView()->isTreeItemEditWidgetActive())
{
case Qt::Key_Space:
case Qt::Key_Enter:
case Qt::Key_Return:
case Qt::Key_Select:
switch (keyEvent->key())
{
RicToggleItemsFeatureImpl::setObjectToggleStateForSelection(RicToggleItemsFeatureImpl::TOGGLE);
case Qt::Key_Space:
case Qt::Key_Enter:
case Qt::Key_Return:
case Qt::Key_Select:
{
RicToggleItemsFeatureImpl::setObjectToggleStateForSelection(RicToggleItemsFeatureImpl::TOGGLE);
keyEvent->setAccepted(true);
return true;
keyEvent->setAccepted(true);
return true;
}
}
}
}

8
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.cpp
View File

@@ -107,6 +107,14 @@ QTreeView* PdmUiTreeView::treeView()
return m_treeViewEditor->treeView();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool PdmUiTreeView::isTreeItemEditWidgetActive() const
{
return m_treeViewEditor->isTreeItemEditWidgetActive();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.h
View File

@@ -72,6 +72,7 @@ public:
void setPdmItem(caf::PdmUiItem* object);
QTreeView* treeView();
bool isTreeItemEditWidgetActive() const;
void selectedUiItems(std::vector<PdmUiItem*>& objects); // TODO: rename
void selectAsCurrentItem(PdmUiItem* uiItem);

13
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
View File

@@ -67,6 +67,11 @@ public:
PdmUiTreeViewWidget(QWidget* parent = 0) : QTreeView(parent) {};
virtual ~PdmUiTreeViewWidget() {};
bool isTreeItemEditWidgetActive() const
{
return state() == QAbstractItemView::EditingState;
}
protected:
virtual void dragMoveEvent(QDragMoveEvent* event)
{
@@ -162,6 +167,14 @@ QTreeView* PdmUiTreeViewEditor::treeView()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool PdmUiTreeViewEditor::isTreeItemEditWidgetActive() const
{
return m_treeView->isTreeItemEditWidgetActive();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

8
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h
View File

@@ -58,10 +58,11 @@ class QVBoxLayout;
namespace caf
{
class PdmUiItem;
class PdmUiTreeViewModel;
class PdmChildArrayFieldHandle;
class PdmUiDragDropInterface;
class PdmUiItem;
class PdmUiTreeViewModel;
class PdmUiTreeViewWidget;
//--------------------------------------------------------------------------------------------------
///
@@ -94,6 +95,7 @@ public:
bool isAppendOfClassNameToUiItemTextEnabled();
QTreeView* treeView();
bool isTreeItemEditWidgetActive() const;
void selectAsCurrentItem(PdmUiItem* uiItem);
void selectedUiItems(std::vector<PdmUiItem*>& objects);
@@ -133,7 +135,7 @@ private:
QPointer<QWidget> m_mainWidget;
QVBoxLayout* m_layout;
QTreeView* m_treeView;
PdmUiTreeViewWidget* m_treeView;
PdmUiTreeViewModel* m_treeViewModel;
PdmUiTreeViewEditorAttribute m_editorAttributes;