diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-04-27 16:53:03 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-04-28 17:18:18 +0000 |
| commit | 3c5a9b10b4dd6696861a62672b322807bb2bfdf6 (patch) | |
| tree | 9517e2718570afd46fdfaade9ad42bc1e2f92ec9 /ui/qt/main_window.h | |
| parent | c22bf7ef7f5edb7d79c5315341673804494f784a (diff) | |
| download | wireshark-3c5a9b10b4dd6696861a62672b322807bb2bfdf6.tar.gz | |
Qt: Display filter toolbar behavior tweaks.
By default GtkToolbar shows overflow items in a menu. QToolBar shows
them in a bigger toolbar. This is a problem for users with lots of
display filter expressions because expanding the display filter toolbar
can make it very tall.
QToolBar can optionally overflow into a menu, but as noted in
https://bugreports.qt.io/browse/QTBUG-2472 there isn't a way do so
directly, e.g. with a setter. Force an overflow menu in the display
filter toolbar by adding a child QToolBar and adding filter expression
actions to it.
While we're here, set the minimum width of the display filter edit to
two-thirds of the width of the main window.
Change-Id: I49cd58397e087f1aa79b5bbce471f827e9804148
Reviewed-on: https://code.wireshark.org/review/15134
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 235011fe57..72bf460479 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -154,6 +154,7 @@ private: QWidget *freeze_focus_; QMap<QAction *, ts_type> td_actions; QMap<QAction *, ts_precision> tp_actions; + QToolBar *filter_expression_toolbar_; bool capture_stopping_; bool capture_filter_valid_; @@ -609,7 +610,8 @@ private slots: void on_actionContextWikiProtocolPage_triggered(); void on_actionContextFilterFieldReference_triggered(); - void changeEvent(QEvent* event); + virtual void changeEvent(QEvent* event); + virtual void resizeEvent(QResizeEvent *); #ifdef HAVE_EXTCAP void extcap_options_finished(int result); |