Don't scroll back to the selected frame when we get name resolution updates.

With live or large capture files and asynchronous name resolution this can
cause serious scrolling issues as the name resolutions come in.

Bug: 12074
Change-Id: I1a5cca410c0608927b32e9e7107885370caf14d7
Reviewed-on: https://code.wireshark.org/review/22245
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

2 files changed, 12 insertions, 4 deletions

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 25dbb5bcea..60c8767b07 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -435,7 +435,7 @@ PacketList::PacketList(QWidget *parent) :
 
     connect(packet_list_model_, SIGNAL(goToPacket(int)), this, SLOT(goToPacket(int)));
     connect(packet_list_model_, SIGNAL(itemHeightChanged(const QModelIndex&)), this, SLOT(updateRowHeights(const QModelIndex&)));
-    connect(wsApp, SIGNAL(addressResolutionChanged()), this, SLOT(redrawVisiblePackets()));
+    connect(wsApp, SIGNAL(addressResolutionChanged()), this, SLOT(redrawVisiblePacketsDontSelectCurrent()));
 
     header()->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(header(), SIGNAL(customContextMenuRequested(QPoint)),
@@ -750,15 +750,22 @@ void PacketList::drawCurrentPacket()
     }
 }
 
-// Redraw the packet list and detail. Called from many places.
-// XXX We previously re-selected the packet here, but that seems to cause
-// automatic scrolling problems.
+// Redraw the packet list and detail.  Re-selects the current packet (causes
+// the UI to scroll to that packet).
+// Called from many places.
 void PacketList::redrawVisiblePackets() {
     update();
     header()->update();
     drawCurrentPacket();
 }
 
+// Redraw the packet list and detail.
+// Does not scroll back to the selected packet.
+void PacketList::redrawVisiblePacketsDontSelectCurrent() {
+    update();
+    header()->update();
+}
+
 void PacketList::resetColumns()
 {
     packet_list_model_->resetColumns();
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 9bb2139a1f..280986efa5 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -176,6 +176,7 @@ public slots:
     void applyTimeShift();
     void recolorPackets();
     void redrawVisiblePackets();
+    void redrawVisiblePacketsDontSelectCurrent();
     void columnsChanged();
     void fieldsChanged(capture_file *cf);
     void preferencesChanged();