From 6c79a718abaf1187b03b79fc671ffacca0e58526 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 16 Jun 2014 16:54:57 -0700
Subject: [PATCH] Column visibility fixups.

Move visibility to its own method and call it when we show ourselves and
when we thaw.

Change-Id: I936cd33e5ccabddb32061ea347a465ac12f1be87
Reviewed-on: https://code.wireshark.org/review/2289
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/packet_list.cpp | 19 ++++++++++++++-----
 ui/qt/packet_list.h   |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index f634af6224..b3a91ec02e 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -422,6 +422,7 @@ void PacketList::showEvent (QShowEvent *event) {
         }
         setColumnWidth(i, col_width);
     }
+    setColumnVisibility();
 }
 
 void PacketList::selectionChanged (const QItemSelection & selected, const QItemSelection & deselected) {
@@ -564,6 +565,18 @@ void PacketList::setFrameReftime(gboolean set, frame_data *fdata)
     updateAll();
 }
 
+void PacketList::setColumnVisibility()
+{
+    if (!cap_file_) {
+        return;
+    }
+
+    for (int i = 0; i < cap_file_->cinfo.num_cols; i++) {
+        setColumnHidden(i, get_column_visible(i) ? false : true);
+    }
+}
+
+
 // Redraw the packet list and detail
 void PacketList::updateAll() {
     update();
@@ -579,11 +592,6 @@ void PacketList::updateAll() {
     }
 
     packet_list_model_->resetColumns();
-
-    for (int i = 0; i < cap_file_->cinfo.num_cols; i++) {
-        setColumnHidden(i, !get_column_visible(i));
-    }
-
 }
 
 void PacketList::freeze()
@@ -596,6 +604,7 @@ void PacketList::thaw()
 {
     setModel(packet_list_model_);
     setUpdatesEnabled(true);
+    setColumnVisibility();
 }
 
 void PacketList::clear() {
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 44bb8fee0c..4f972bef0e 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -73,6 +73,7 @@ private:
     void setFrameMark(gboolean set, frame_data *fdata);
     void setFrameIgnore(gboolean set, frame_data *fdata);
     void setFrameReftime(gboolean set, frame_data *fdata);
+    void setColumnVisibility();
 
 signals:
     void packetDissectionChanged();