4 files changed, 14 insertions, 66 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
-            }
         }
     }
 }
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 86a345faf..3410528cf 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 2f6f1d709..e131f1d45 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 6a72a9b28..48f62f167 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) +