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

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>
This commit is contained in:
Stig Bjørlykke 2017-02-19 19:46:13 +01:00 committed by Anders Broman
parent b3f435ef54
commit 6c654861d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/main_window_slots.cpp
View File

@ -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;
}