Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cancel any edit in progress when wxTreeCtrl is scrolled

Browse Source 
Otherwise the editor could be scrolled out of view, confusing the user.

Closes https://github.com/wxWidgets/wxWidgets/pull/1522
This commit is contained in:
Matthew Griffin
2019-09-02 09:24:50 +01:00
committed by Vadim Zeitlin
parent 8c18ee8c25
commit 337644f702
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/treectrl.cpp
View File

@@ -23,6 +23,7 @@
#include <QtWidgets/QTreeWidget> #include <QtWidgets/QTreeWidget>
#include <QtWidgets/QHeaderView> #include <QtWidgets/QHeaderView>
#include <QtWidgets/QScrollBar>
#include <QtGui/QPainter> #include <QtGui/QPainter>
namespace namespace
@@ -142,6 +143,8 @@ public:
this, &wxQTreeWidget::OnItemCollapsed); this, &wxQTreeWidget::OnItemCollapsed);
connect(this, &QTreeWidget::itemExpanded, connect(this, &QTreeWidget::itemExpanded,
this, &wxQTreeWidget::OnItemExpanded); this, &wxQTreeWidget::OnItemExpanded);
connect(verticalScrollBar(), &QScrollBar::valueChanged,
this, &wxQTreeWidget::OnTreeScrolled);
setItemDelegate(&m_item_delegate); setItemDelegate(&m_item_delegate);
setDragEnabled(true); setDragEnabled(true);
@@ -438,6 +441,12 @@ private:
EmitEvent(expandedEvent); EmitEvent(expandedEvent);
} }
void OnTreeScrolled(int)
{
if ( GetEditControl() != NULL )
closeEditor(GetEditControl()->GetHandle(), QAbstractItemDelegate::RevertModelCache);
}
void tryStartDrag(const QMouseEvent *event) void tryStartDrag(const QMouseEvent *event)
{ {
wxEventType command = event->buttons() & Qt::RightButton wxEventType command = event->buttons() & Qt::RightButton