summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-11-17 11:47:56 -0800
committerGerald Combs <gerald@wireshark.org>2015-11-17 22:00:10 +0000
commit5afff3916d92a9500ac36e86694c04a11a30e404 (patch)
tree6f403d154f48fd2aaaed0c34acba6700390deb0e
parent95b767566b38eab344c9bc620808db5197f97be8 (diff)
downloadwireshark-5afff3916d92a9500ac36e86694c04a11a30e404.tar.gz
Qt: Fixup the I/O Graph color menu width on Windows.
Change-Id: I2032709fe62810a292121e8624a4b51f40070c36 Reviewed-on: https://code.wireshark.org/review/11921 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit ec68330053267c6c368013f761d0cf7efe5a0cf3) Reviewed-on: https://code.wireshark.org/review/11926
-rw-r--r--ui/qt/io_graph_dialog.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 2e6da60e39..002043b01b 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -1222,6 +1222,13 @@ void IOGraphDialog::on_graphTreeWidget_itemActivated(QTreeWidgetItem *item, int
item->setIcon(color_col_, QIcon());
color_combo_box_->setFocusPolicy(Qt::StrongFocus);
+#ifdef Q_OS_WIN
+ // QTBUG-3097
+ color_combo_box_->view()->setMinimumWidth(
+ style()->pixelMetric(QStyle::PM_ListViewIconSize) + // Not entirely correct but close enough.
+ style()->pixelMetric(QStyle::PM_ScrollBarExtent));
+#endif
+
style_combo_box_ = new QComboBox();
cur_idx = item->data(style_col_, Qt::UserRole).toInt();
for (int i = 0; i < plot_style_to_name_.size(); i++) {