@@ -33,6 +33,7 @@ Showable {
3333 property bool enableHint: true
3434 property bool showOnClick: true
3535 property color panelColor: theme.palette.normal.background
36+ property real menuContentX: 0
3637
3738 property alias alignment: bar.alignment
3839 property alias rowTitle: bar.rowTitle
@@ -77,33 +78,42 @@ Showable {
7778
7879 shown: false
7980 height: minimizedPanelHeight
80− clip: root.partiallyOpened
8181
8282 onUnitProgressChanged: d.updateState()
8383
84− // eater
85− MouseArea {
86− anchors.fill: content
87− hoverEnabled: true
88− acceptedButtons: Qt.AllButtons
89− onWheel: wheel.accepted = true;
90− enabled: root.state != "initial"
91− visible: content.visible
92− }
93−
94− MenuContent {
95− id: content
96− objectName: "menuContent"
97−
84+ Item {
9885 anchors {
9986 left: parent.left
10087 right: parent.right
10188 top: bar.bottom
89+ bottom: parent.bottom
90+ }
91+ clip: root.partiallyOpened
92+
93+ // eater
94+ MouseArea {
95+ anchors.fill: content
96+ hoverEnabled: true
97+ acceptedButtons: Qt.AllButtons
98+ onWheel: wheel.accepted = true;
99+ enabled: root.state != "initial"
100+ visible: content.visible
101+ }
102+
103+ MenuContent {
104+ id: content
105+ objectName: "menuContent"
106+
107+ anchors {
108+ left: parent.left
109+ right: parent.right
110+ top: parent.top
111+ }
112+ height: openedHeight - bar.height - handle.height
113+ model: root.model
114+ visible: root.unitProgress > 0
115+ currentMenuIndex: bar.currentItemIndex
102116 }
103− height: openedHeight - bar.height - handle.height
104− model: root.model
105− visible: root.unitProgress > 0
106− currentMenuIndex: bar.currentItemIndex
107117 }
108118
109119 Handle {
@@ -165,6 +175,7 @@ Showable {
165175 enableLateralChanges: false
166176 lateralPosition: -1
167177 unitProgress: root.unitProgress
178+ shiftLeftTitle: root.menuContentX
168179
169180 height: expanded ? expandedPanelHeight : minimizedPanelHeight
170181 Behavior on height { NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing } }
@@ -217,6 +228,7 @@ Showable {
217228 objectName: "showDragHandle"
218229 anchors.bottom: parent.bottom
219230 anchors.left: alignment == Qt.AlignLeft ? parent.left : undefined
231+ anchors.leftMargin: -root.menuContentX
220232 anchors.right: alignment == Qt.AlignRight ? parent.right : undefined
221233 width: root.barWidth // show handle should only cover panel items.
222234 height: minimizedPanelHeight