diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-10-30 23:23:24 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-10-30 23:23:24 +0000 |
commit | b17d987960701e01b1c8396fd2cb300b4cb1f05d (patch) | |
tree | ee38d25b9016e5b28418635f8154f310836da28d /ui | |
parent | 8f21bfe46f49c8eaec444622b6d0fb56299a8ba3 (diff) | |
download | wireshark-b17d987960701e01b1c8396fd2cb300b4cb1f05d.tar.gz |
Fix maximized geometry behavior on non-OS X systems.
svn path=/trunk/; revision=52990
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/main_window.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index a18bfb13c5..d3be2cbbd5 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -444,6 +444,11 @@ void MainWindow::loadWindowGeometry() // Let Qt move and resize our window if needed (e.g. if it's offscreen) QByteArray geom = shadow_main.saveGeometry(); +#ifndef Q_OS_MAC + if (prefs.gui_geometry_save_maximized && recent.gui_geometry_main_maximized) { + setWindowState(Qt::WindowMaximized); + } else +#endif if (strlen (get_conn_cfilter()) < 1) { QPropertyAnimation *pos_anim = new QPropertyAnimation(this, "pos"); QPropertyAnimation *size_anim = new QPropertyAnimation(this, "size"); @@ -463,11 +468,6 @@ void MainWindow::loadWindowGeometry() restoreGeometry(geom); } -#ifndef Q_OS_MAC - if (prefs.gui_geometry_save_maximized && recent.gui_geometry_main_maximized) { - setWindowState(Qt::WindowMaximized); - } -#endif } void MainWindow::saveWindowGeometry() |