Fixup the packet list navigation action behavior.

Change-Id: I124fe3c3755556e81c65443b8b9744a89394dc70
Reviewed-on: https://code.wireshark.org/review/9218
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 20 insertions, 6 deletions

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index de4ce5bdeb..c6bea960bd 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -986,24 +986,38 @@ void PacketList::setMonospaceFont(const QFont &mono_font)
 }
 
 void PacketList::goNextPacket(void) {
-    if (!selectionModel()->hasSelection()) return;
-    setCurrentIndex(moveCursor(MoveDown, Qt::NoModifier));
+    if (selectionModel()->hasSelection()) {
+        setCurrentIndex(moveCursor(MoveDown, Qt::NoModifier));
+    } else {
+        // First visible packet.
+        setCurrentIndex(indexAt(viewport()->rect().topLeft()));
+    }
 }
 
 void PacketList::goPreviousPacket(void) {
-    if (!selectionModel()->hasSelection()) return;
-    setCurrentIndex(moveCursor(MoveUp, Qt::NoModifier));
+    if (selectionModel()->hasSelection()) {
+        setCurrentIndex(moveCursor(MoveUp, Qt::NoModifier));
+    } else {
+        // Last visible packet.
+        QModelIndex last_idx = indexAt(viewport()->rect().bottomLeft());
+        if (last_idx.isValid()) {
+            setCurrentIndex(last_idx);
+        } else {
+            goLastPacket();
+        }
+    }
 }
 
 void PacketList::goFirstPacket(void) {
     if (packet_list_model_->rowCount() < 1) return;
     setCurrentIndex(packet_list_model_->index(0, 0));
+    scrollTo(currentIndex());
 }
 
 void PacketList::goLastPacket(void) {
     if (packet_list_model_->rowCount() < 1) return;
-    setCurrentIndex(packet_list_model_->index(0, 0));
-    setCurrentIndex(moveCursor(MoveEnd, Qt::NoModifier));
+    setCurrentIndex(packet_list_model_->index(packet_list_model_->rowCount() - 1, 0));
+    scrollTo(currentIndex());
 }
 
 // XXX We can jump to the wrong packet if a display filter is applied