diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-05-26 12:55:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-26 18:54:41 +0000 |
| commit | 00bcd845bd2ce6f93ec5b7782420570d74cad2a4 (patch) | |
| tree | 786d04421b63005dc66e3c7227ea943f57108db4 /src/controls/ApplicationWindow.qml | |
| parent | a955ff06fff32a63766a142ea7dd7dcf7261fc6e (diff) | |
Revert "iOS: Make ApplicationWindow fill entire screen, including under statusbar"
This is a nice to have iOS feature, but it breaks all the other platforms.
This reverts commit 10a57f37d0f03e8642a7c92dcacf287c95777342.
Change-Id: Iec7cfa8be1bb214d0f86047826a5c0cdcf447c1e
Task-number: QTBUG-45973
Task-number: QTBUG-46119
Task-number: QTBUG-46134
Task-number: QTBUG-46180
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 2f019d310..542cfe4e2 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -198,19 +198,11 @@ Window { /*! \internal */ default property alias data: contentArea.data - flags: { - var flags = Qt.Window | Qt.WindowFullscreenButtonHint; - - // QTBUG-35049: Windows is removing features we didn't ask for, even though Qt::CustomizeWindowHint is not set - // Otherwise Qt.Window | Qt.WindowFullscreenButtonHint would be enough - flags |= Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | - Qt.WindowCloseButtonHint | Qt.WindowFullscreenButtonHint - - if (Settings.styleName === "iOS") - flags |= Qt.MaximizeUsingFullscreenGeometryHint; - - return flags; - } + flags: Qt.Window | Qt.WindowFullscreenButtonHint | + Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | + Qt.WindowCloseButtonHint | Qt.WindowFullscreenButtonHint + // QTBUG-35049: Windows is removing features we didn't ask for, even though Qt::CustomizeWindowHint is not set + // Otherwise Qt.Window | Qt.WindowFullscreenButtonHint would be enough Loader { id: panelLoader @@ -243,12 +235,8 @@ Window { ContentItem { id: contentArea + anchors.fill: parent parent: __panel.contentArea - anchors { - fill: parent - topMargin: systemPadding.top; bottomMargin: systemPadding.bottom - leftMargin: systemPadding.left; rightMargin: systemPadding.right - } } } } |