AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not modify window size for fullscreen windows in setGeometry_sys

Browse Source 
Minimum sizes of widgets can cause windows to expand beyond screen
limits in QWidgetPrivate::setGeometry_sys. Normally this is not
noticeable as the window size is forced in various places to the
clientRect, but there are certain sequences where the size set in
setGeometry_sys is the final one, resulting in too large windows.

Removed the modification of window size in setGeometry_sys
for fullscreen windows for which the correct size is already requested.

Task-number: QTBUG-18749
Reviewed-by: Sami Merila
(cherry picked from commit da8f333cfe17a53d475208efa36fa369a9ee4638)
This commit is contained in:
Miikka Heikkinen 2011-04-18 15:40:26 +03:00 committed by Olivier Goffart
parent d00555862c
commit dd646cd10e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/kernel/qwidget_s60.cpp
View File

@ -239,7 +239,16 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
if (w != oldSize.width() || h != oldSize.height())
data.window_state &= ~Qt::WindowMaximized;
if (extra) { // any size restrictions?
bool checkExtra = true;
if (q->isWindow() && (data.window_state & Qt::WindowFullScreen)) {
// Do not modity window size for fullscreen windows, if requested
// size is already equal to clientRect.
TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
if (w == r.Width() && h == r.Height())
checkExtra = false;
}
if (checkExtra && extra) { // any size restrictions?
w = qMin(w,extra->maxw);
h = qMin(h,extra->maxh);
w = qMax(w,extra->minw);