osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Set a minimum width for the main window. 

Set a minimum width for the main window so that we override the minimum
size set by the display filter combo.

Add a couple of comments and fixup a cast while we're here.

Bug: 13516
Change-Id: I6e994a7d06f5a966bb9bf8d3f4c4fc343cd466c8
Reviewed-on: https://code.wireshark.org/review/27697
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>
This commit is contained in:
Gerald Combs 2018-05-21 15:47:21 -07:00 committed by Anders Broman
parent f45ef3d46d
commit 50197b3023
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/qt/main_window.cpp
View File

@ -364,8 +364,13 @@ MainWindow::MainWindow(QWidget *parent) :
Qt::BlockingQueuedConnection);
#endif
// We set the minimum width of df_combo_box_ in resizeEvent so that it won't shrink
// down too much if we have a lot of filter buttons. Unfortunately that can break
// Aero snapping if our window is large or maximized. Set a minimum width here in
// order to counteract that.
setMinimumWidth(350); // Arbitrary
df_combo_box_ = new DisplayFilterCombo();
const DisplayFilterEdit *df_edit = dynamic_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
const DisplayFilterEdit *df_edit = qobject_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
connect(df_edit, SIGNAL(pushFilterSyntaxStatus(const QString&)),
main_ui_->statusBar, SLOT(pushFilterStatus(const QString&)));
connect(df_edit, SIGNAL(popFilterSyntaxStatus()), main_ui_->statusBar, SLOT(popFilterStatus()));

3
ui/qt/widgets/capture_filter_combo.cpp
View File

@ -30,7 +30,8 @@ CaptureFilterCombo::CaptureFilterCombo(QWidget *parent, bool plain) :
// completion for fields handled by CaptureFilterEdit.
setAutoCompletion(false);
setLineEdit(cf_edit_);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
// Default is Preferred.
setSizePolicy(QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy());
setInsertPolicy(QComboBox::NoInsert);
setAccessibleName(tr("Capture filter selector"));
setStyleSheet(

3
ui/qt/widgets/display_filter_combo.cpp
View File

@ -34,7 +34,8 @@ DisplayFilterCombo::DisplayFilterCombo(QWidget *parent) :
// completion for fields handled by DisplayFilterEdit.
setAutoCompletion(false);
setLineEdit(new DisplayFilterEdit(this, DisplayFilterToApply));
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
// Default is Preferred.
setSizePolicy(QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy());
setAccessibleName(tr("Display filter selector"));
cur_display_filter_combo = this;
setStyleSheet(