From 8a4d259e7ba2b10960c5598ad3276797fae9dfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Wed, 15 Feb 2017 21:41:08 +0100 Subject: Qt: Auto detect pane size when configured zero MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit a98eb3c3125d0b353f2b571890f5854e2b977f42) Reviewed-on: https://code.wireshark.org/review/20128 Reviewed-by: Stig Bjørlykke --- ui/qt/main_window_slots.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'ui') diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 16a65ba68f..2280f886a1 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -427,6 +427,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) { @@ -438,6 +441,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; -- cgit v1.2.3