diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-08-11 08:49:38 (GMT) |
|---|---|---|
| committer | Timo Turunen <timo.p.turunen@nokia.com> | 2011-08-30 07:02:10 (GMT) |
| commit | 2f97e4894d4110150b2248e93c6a59916da95bc4 (patch) | |
| tree | 889c870902acbcc2db37a04558ca525e7bfec094 | |
| parent | 35108903fa1c7b8d2d2afb86914de8ed5028c12d (diff) | |
| download | Qt-2f97e4894d4110150b2248e93c6a59916da95bc4.zip Qt-2f97e4894d4110150b2248e93c6a59916da95bc4.tar.gz Qt-2f97e4894d4110150b2248e93c6a59916da95bc4.tar.bz2 | |
Fix clientRect usage in QWidgetPrivate::setGeometry_sys()
S60->clientRect() should be used these days for getting S60 client rect,
so fix the old fashined usage that was in cherry-picked commit.
Task-number: QTTH-1306
Reviewed-by: TrustMe
(cherry picked from commit 15b44c1ea04c3beebe4d7f6d9f45b81127c3c8f9)
Reapplied after bad v4.7.4 merge
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index e437579..c490572 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -238,7 +238,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) bool checkExtra = true; if (q->isWindow() && (data.window_state & (Qt::WindowFullScreen | Qt::WindowMaximized))) { // Do not allow fullscreen/maximized windows to expand beyond client rect - TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect(); + TRect r = S60->clientRect(); w = qMin(w, r.Width()); h = qMin(h, r.Height()); |