From 4a37dfc57e26b32250fe27a11986dee8aec24801 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 13 May 2015 12:34:25 -0700
Subject: [PATCH] Qt: Add the correct column width padding.

When applying recent column widths, add the correct padding in the
right place.

Bug: 11175
Change-Id: I5a6fe7975764ddc5d9024d8839a837579b2bf799
Ping-Bug: 11179
Reviewed-on: https://code.wireshark.org/review/8456
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/packet_list.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 80d51e5377..997b66e9bd 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -604,7 +604,7 @@ int PacketList::sizeHintForColumn(int column) const
         size_hint = itemDelegateForColumn(column)->sizeHint(viewOptions(), QModelIndex()).width();
     }
     packet_list_model_->setSizeHintEnabled(false);
-    size_hint += QTreeView::sizeHintForColumn(column);
+    size_hint += QTreeView::sizeHintForColumn(column); // Decoration padding
     packet_list_model_->setSizeHintEnabled(true);
     return size_hint;
 }
@@ -693,8 +693,11 @@ void PacketList::applyRecentColumnWidths()
             } else {
                 col_width = fm.width(MIN_COL_WIDTH_STR);
             }
+            // Custom delegate padding
+            if (itemDelegateForColumn(i)) {
+                col_width += itemDelegateForColumn(i)->sizeHint(viewOptions(), QModelIndex()).width();
+            }
         }
-        col_width += QTreeView::sizeHintForColumn(i); // Decoration padding
         setColumnWidth(i, col_width) ;
     }
     column_state_ = header()->saveState();