@@ -499,11 +499,7 @@ StyledItem {
499 expandedPanelHeight: units.gu(7)
499 expandedPanelHeight: units.gu(7)
500 indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
500 indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
501 applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
501 applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
502− applicationMenuContentX: {
502+ applicationMenuContentX: launcher.lockedVisible ? launcher.panelWidth : 0
503− if (launcher.shown) return launcher.panelWidth;
504− else if (!applicationMenus.fullyClosed) return applicationMenus.x;
508 indicators {
504 indicators {
509 hides: [launcher]
505 hides: [launcher]
@@ -574,6 +570,11 @@ StyledItem {
574 panel.applicationMenus.hide();
570 panel.applicationMenus.hide();
573+ onDrawerShownChanged: {
575+ panel.applicationMenus.hide();
577 onFocusChanged: {
578 onFocusChanged: {
578 if (!focus) {
579 if (!focus) {
579 stage.focus = true;
580 stage.focus = true;