Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 44 insertions, 0 deletions

diff --git a/ui/qt/tabnav_tree_widget.cpp b/ui/qt/tabnav_tree_widget.cpp
new file mode 100644
index 00000000..34c31210
--- /dev/null
+++ b/ui/qt/tabnav_tree_widget.cpp
@@ -0,0 +1,44 @@
+/* tabnav_tree_widget.cpp
+ * Tree widget with saner tab navigation properties.
+ *
+ * Copyright 2017 Peter Wu <peter@lekensteyn.nl>
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tabnav_tree_widget.h"
+
+// Copy of TabnavTreeView, modified to use QTreeWidget instead of QTreeView.
+
+TabnavTreeWidget::TabnavTreeWidget(QWidget *parent) : QTreeWidget(parent)
+{
+}
+
+// Note: if a QTableWidget is used, then this is not needed anymore since Tab
+// works as "expected" (move to next cell instead of row).
+// Note 2: this does not help with fields with no widget (like filename).
+QModelIndex TabnavTreeWidget::moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers)
+{
+    QModelIndex current = currentIndex();
+    // If an item is currently selected, interpret Next/Previous. Otherwise,
+    // fallback to the default selection (e.g. first row for Next).
+    if (current.isValid()) {
+        if (cursorAction == MoveNext) {
+            if (current.column() < model()->columnCount()) {
+                return current.sibling(current.row(), current.column() + 1);
+            }
+            return current;
+        } else if (cursorAction == MovePrevious) {
+            if (current.column() > 0) {
+                return current.sibling(current.row(), current.column() - 1);
+            }
+            return current;
+        }
+    }
+
+    return QTreeView::moveCursor(cursorAction, modifiers);
+}