diff options
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 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 { |