diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-11-06 15:36:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-08 07:19:57 +0100 |
| commit | a301e868f7a24a7b98b22623b01be92488527c8d (patch) | |
| tree | f85b8cf789e8defc922871bfaed4faf32f0166ec /src/plugins/platforms/ios/qioswindow.mm | |
| parent | b2f26362176b77b812de5cfbaca5d70d3d786218 (diff) | |
iOS: Rename m_requestedGeometry to m_normalGeometry
Matches the wording using in QWidget.
Change-Id: Ifbb4e5ffa90b47a7c179cf9ec52cb46126d7bccc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qioswindow.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index f1189ccd88..9eba049f95 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -317,7 +317,7 @@ QT_BEGIN_NAMESPACE QIOSWindow::QIOSWindow(QWindow *window) : QPlatformWindow(window) , m_view([[EAGLView alloc] initWithQIOSWindow:this]) - , m_requestedGeometry(QPlatformWindow::geometry()) + , m_normalGeometry(QPlatformWindow::geometry()) , m_windowLevel(0) , m_devicePixelRatio(1.0) { @@ -386,7 +386,7 @@ void QIOSWindow::setGeometry(const QRect &rect) { // If the window is in fullscreen, just bookkeep the requested // geometry in case the window goes into Qt::WindowNoState later: - m_requestedGeometry = rect; + m_normalGeometry = rect; if (window()->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) return; @@ -413,7 +413,7 @@ void QIOSWindow::setWindowState(Qt::WindowState state) m_view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; break; } default: - m_view.frame = toCGRect(m_requestedGeometry); + m_view.frame = toCGRect(m_normalGeometry); m_view.autoresizingMask = UIViewAutoresizingNone; break; } |