aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-02-13 17:08:14 -0800
committerAnders Broman <a.broman58@gmail.com>2018-02-14 05:32:50 +0000
commit30841256963df53292a6904952ed4288e85d0ff6 (patch)
treedabcb2aa54af767f13ca5cad625a277776d41931
parent6f2d4c27126f3d1a73494ceafc464df99e081494 (diff)
Qt: Fix the filter expression toolbar layout.
Take a hint from the QToolButton sources and update the filter expression toolbar using updateGeometry instead of adjustSize. This appears to do the layout updates and other changes required to draw the dropdown in the correct place. Bug: 14121 Change-Id: I45d5a1173703f9c16d89841a57f651935da43d92 Reviewed-on: https://code.wireshark.org/review/25784 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--ui/qt/main_window_slots.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 26abffd4ff..67bac429ce 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1028,7 +1028,9 @@ void MainWindow::filterExpressionsChanged()
filter_expression_iterate_expressions(filter_expression_add_action, &data);
if (data.actions_added) {
- main_ui_->displayFilterToolBar->adjustSize();
+ // QToolButton calls updateGeometry+update all over the place.
+ // updateGeometry should be sufficient here.
+ main_ui_->displayFilterToolBar->updateGeometry();
}
}