osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Auto detect pane size when configured zero 

The recent file configuration for pane sizes states that
“pane size of zero will auto detect”, so ensure we do this in
all cases where the settings may be zero.

This affects initial startup, Default profile reset and new profiles.

Change-Id: I1430ec1a83b7fb294b92837476f2bf9472384e45
Reviewed-on: https://code.wireshark.org/review/20121
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Stig Bjørlykke 2017-02-15 21:41:08 +01:00 committed by Anders Broman
parent 989b9d5188
commit a98eb3c312
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/qt/main_window_slots.cpp
View File

@ -431,6 +431,9 @@ void MainWindow::applyRecentPaneGeometry()
if (recent.gui_geometry_main_upper_pane > 0) {
master_sizes[0] = recent.gui_geometry_main_upper_pane + 1; // Add back mystery pixel
master_last_size -= recent.gui_geometry_main_upper_pane + master_split_.handleWidth();
} else {
master_sizes[0] = master_last_size / master_sizes.length();
master_last_size -= master_last_size / master_sizes.length() + master_split_.handleWidth();
}
if (recent.gui_geometry_main_lower_pane > 0) {
@ -442,6 +445,15 @@ void MainWindow::applyRecentPaneGeometry()
extra_last_size -= recent.gui_geometry_main_lower_pane + extra_split_.handleWidth();
extra_sizes.last() = extra_last_size;
}
} else {
if (master_sizes.length() > 2) {
master_sizes[1] = master_last_size / 2;
master_last_size -= master_last_size / 2 + master_split_.handleWidth();
} else {
extra_sizes[0] = extra_last_size / 2;
extra_last_size -= extra_last_size / 2 + extra_split_.handleWidth();
extra_sizes.last() = extra_last_size;
}
}
master_sizes.last() = master_last_size;