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 | |
parent | a955ff06fff32a63766a142ea7dd7dcf7261fc6e (diff) | |
download | qtquickcontrols-00bcd845bd2ce6f93ec5b7782420570d74cad2a4.tar.gz |
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>
-rw-r--r-- | src/controls/ApplicationWindow.qml | 24 | ||||
-rw-r--r-- | src/controls/MenuBar.qml | 13 | ||||
-rw-r--r-- | src/controls/Private/ContentItem.qml | 33 | ||||
-rw-r--r-- | src/controls/ToolBar.qml | 10 |
4 files changed, 14 insertions, 66 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 2f019d31..542cfe4e 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 - } } } } diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml index 86a345fa..3410528c 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -132,11 +132,6 @@ MenuBarPrivate { value: menuMouseArea.z - 1 } - ContentItem { - // Only used for system padding, the real content item is the Row below - id: contentItem - } - QtObject { id: d @@ -144,8 +139,7 @@ MenuBarPrivate { property int openedMenuIndex: -1 property bool preselectMenuItem: false - property real heightPadding: (style ? style.padding.top + style.padding.bottom : 0) - + contentItem.systemPadding.top + contentItem.systemPadding.bottom + property real heightPadding: style ? style.padding.top + style.padding.bottom : 0 property bool altPressed: false property bool altPressedAgain: false @@ -225,10 +219,9 @@ MenuBarPrivate { Row { id: row - x: (d.style ? d.style.padding.left : 0) + contentItem.systemPadding.left - y: (d.style ? d.style.padding.top : 0) + contentItem.systemPadding.top + x: d.style ? d.style.padding.left : 0 + y: d.style ? d.style.padding.top : 0 width: parent.width - (d.style ? d.style.padding.left + d.style.padding.right : 0) - - (contentItem.systemPadding.left + contentItem.systemPadding.right) LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft Repeater { diff --git a/src/controls/Private/ContentItem.qml b/src/controls/Private/ContentItem.qml index 2f6f1d70..e131f1d4 100644 --- a/src/controls/Private/ContentItem.qml +++ b/src/controls/Private/ContentItem.qml @@ -36,9 +36,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Private 1.0 -import QtQuick.Window 2.2 Item { id: contentItem @@ -49,8 +46,6 @@ Item { implicitWidth: __calcImplicitWidth() implicitHeight: __calcImplicitHeight() - property Padding systemPadding: Padding { top: 0; left: 0; bottom: 0; right: 0 } - /*! \internal */ property Item __layoutItem: contentItem.visibleChildren.length === 1 ? contentItem.visibleChildren[0] : null /*! \internal */ @@ -107,32 +102,4 @@ Item { extent += contentItem['__margins' + hw] return extent } - - /*! \internal */ - property rect __screenReservedArea: { - return Qt.rect( - Screen.width - Screen.desktopAvailableWidth, - Screen.height - Screen.desktopAvailableHeight, - 0, 0 - ); - } - - /*! \internal */ - property rect __systemPadding: { - if (Window.visibility != Window.Maximized) - return Qt.rect(0, 0, 0, 0) - - return Qt.rect( - Math.max(0, __screenReservedArea.x - contentItem.parent.x - Controls.window.x), - Math.max(0, __screenReservedArea.y - contentItem.parent.y - Controls.window.y), - 0, 0 - ); - } - - on__SystemPaddingChanged: { - systemPadding.top = __systemPadding.y - systemPadding.left = __systemPadding.x - systemPadding.right = __systemPadding.width - systemPadding.bottom = __systemPadding.height - } } diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index 6a72a9b2..48f62f16 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -139,7 +139,7 @@ FocusScope { sourceComponent: style } }, - ContentItem { + Item { id: container z: 1 focus: true @@ -150,10 +150,10 @@ FocusScope { anchors.rightMargin: rightMargin + (buttonLoader.active ? buttonLoader.width + rightMargin : 0) anchors.bottomMargin: bottomMargin - property int topMargin: (__style ? __style.padding.top : 0) + systemPadding.top - property int bottomMargin: (__style ? __style.padding.bottom : 0) + systemPadding.bottom - property int leftMargin: (__style ? __style.padding.left : 0) + systemPadding.left - property int rightMargin: (__style ? __style.padding.right : 0) + systemPadding.right + property int topMargin: __style ? __style.padding.top : 0 + property int bottomMargin: __style ? __style.padding.bottom : 0 + property int leftMargin: __style ? __style.padding.left : 0 + property int rightMargin: __style ? __style.padding.right : 0 property Item layoutItem: container.children.length === 1 ? container.children[0] : null property real layoutWidth: layoutItem ? (layoutItem.implicitWidth || layoutItem.width) + |