summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-05-05 14:10:51 +0300
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-11 16:39:20 +0200
commita2e836f3c1acaef5e41893d1c4eb1ef8674b315e (patch)
treeee5677b1809fb985239ade1f1dd118099e31f923 /src
parent4b2d966566a3329e0cb1776582dc508d8ffc0351 (diff)
Fix initial main window dimensions for "fullscreen with softkeys" case
The application main window defaults to fullscreen size when initially constructed, even if softkeys are specified for it, as the screen furniture is constructed later in show_sys. This resulted in the main window being partially under softkeys. Fixed by invoking handleClientAreaChange() explicitly in show_sys in fullscreen with softkeys case. Task-number: QTBUG-19043 Reviewed-by: Sami Merila (cherry picked from commit e8fc93973a41f193665baa5fdc26cba951bd692f)
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwidget_s60.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 12bcc4b4cc..24dd00a770 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -576,6 +576,11 @@ void QWidgetPrivate::show_sys()
if (isFullscreen) {
const bool cbaVisible = S60->buttonGroupContainer() && S60->buttonGroupContainer()->IsVisible();
S60->setStatusPaneAndButtonGroupVisibility(false, cbaVisible);
+ if (cbaVisible) {
+ // Fix window dimensions as without screen furniture they will have
+ // defaulted to full screen dimensions initially.
+ id->handleClientAreaChange();
+ }
}
}
}