osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Fix DragDrop on ProtoTree 

Fix two issues, first that you could not move the scrollbar as it would
initiate a drag-drop operation. Second, if you start a drag-drop operation
at the top of a field, it would select the field you move over as well.

Change-Id: I553785b1b6c586919e025d3042a876701f36860d
Reviewed-on: https://code.wireshark.org/review/24376
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2017-11-12 11:16:34 +01:00
parent 8e5436687a
commit 447291d84a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/qt/proto_tree.cpp
View File

@ -38,6 +38,7 @@
#include <QScrollBar>
#include <QTreeWidgetItemIterator>
#include <QUrl>
#include <QItemSelectionModel>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QWindow>
@ -708,6 +709,10 @@ bool ProtoTree::eventFilter(QObject * obj, QEvent * event)
if ( cap_file_ && event->type() != QEvent::MouseButtonPress && event->type() != QEvent::MouseMove )
return QTreeWidget::eventFilter(obj, event);
/* Mouse was over scrollbar, ignoring */
if ( qobject_cast<QScrollBar *>(obj) )
return QTreeWidget::eventFilter(obj, event);
if ( event->type() == QEvent::MouseButtonPress )
{
QMouseEvent * ev = (QMouseEvent *)event;
@ -728,6 +733,12 @@ bool ProtoTree::eventFilter(QObject * obj, QEvent * event)
field_info * fi = VariantPointer<field_info>::asPtr(item->data(0, Qt::UserRole));
if ( fi )
{
/* Hack to prevent QItemSelection taking the item which has been dragged over at start
* of drag-drop operation. selectionModel()->blockSignals could have done the trick, but
* it does not take in a QTreeWidget (maybe View) */
QModelIndex idx = indexFromItem(item, 0);
emit fieldSelected(new FieldInformation(fi, this));
selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect);
QString filter = QString(proto_construct_match_selected_string(fi, cap_file_->edt));