diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-02-19 19:46:13 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-02-20 05:54:19 +0000 |
| commit | 6c654861d94869e32536c19c5001666c1faf96c7 (patch) | |
| tree | 60e4dc2c139a1b5a2b89c905e16e9d744f72c8bd | |
| parent | b3f435ef54686718aea652a6d6725b3cd62dd1e0 (diff) | |
| download | wireshark-6c654861d94869e32536c19c5001666c1faf96c7.tar.gz | |
Qt: Mystery pixel issue is solved
The mystery pixel issue has probably been mysteriously solved earlier
because the adjustments does not work as expected now.
This fixes an issue where one of the panes increases with 1 pixel at
startup and when changing profile using layout type 3, 4, 5 and 6
(selection number 1, 4, 5 and 6 in “Preferences -> Appearance -> Layout”).
Change-Id: Iab36fa5303dc8628b21e5cf920e7c70a7167d76e
Reviewed-on: https://code.wireshark.org/review/20188
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>
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 320fb27d6c..1f4119aa1a 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -432,7 +432,7 @@ void MainWindow::applyRecentPaneGeometry() extra_last_size -= extra_split_.handleWidth(); if (recent.gui_geometry_main_upper_pane > 0) { - master_sizes[0] = recent.gui_geometry_main_upper_pane + 1; // Add back mystery pixel + master_sizes[0] = recent.gui_geometry_main_upper_pane; master_last_size -= recent.gui_geometry_main_upper_pane; } else { master_sizes[0] = master_last_size / master_sizes.length(); @@ -441,10 +441,10 @@ void MainWindow::applyRecentPaneGeometry() if (recent.gui_geometry_main_lower_pane > 0) { if (master_sizes.length() > 2) { - master_sizes[1] = recent.gui_geometry_main_lower_pane + 1; // Add back mystery pixel + master_sizes[1] = recent.gui_geometry_main_lower_pane; master_last_size -= recent.gui_geometry_main_lower_pane; } else if (extra_sizes.length() > 0) { - extra_sizes[0] = recent.gui_geometry_main_lower_pane; // No mystery pixel + extra_sizes[0] = recent.gui_geometry_main_lower_pane; extra_last_size -= recent.gui_geometry_main_lower_pane; extra_sizes.last() = extra_last_size; } |