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/MenuBar.qml | |
| 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>
Diffstat (limited to 'src/controls/MenuBar.qml')
| -rw-r--r-- | src/controls/MenuBar.qml | 13 |
1 files changed, 3 insertions, 10 deletions
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 { |