on xenial help sign in
Fixed ActionContext scopes
b108ceaNick Dedekind
qml/ApplicationMenus/MenuBar.qml+1−1
@@ -69,7 +69,7 @@ Item {
69 ActionContext {
69 ActionContext {
70 id: menuBarContext
70 id: menuBarContext
71 objectName: "barContext"
71 objectName: "barContext"
72− active: !d.currentItem
72+ active: !d.currentItem && enableKeyFilter
73 }
73 }
74
74
75 Repeater {
75 Repeater {
qml/Stage/WindowDecoration.qml+1−1
@@ -140,7 +140,7 @@ MouseArea {
140 sourceComponent: MenuBar {
140 sourceComponent: MenuBar {
141 id: menuBar
141 id: menuBar
142 height: menuBarLoader.height
142 height: menuBarLoader.height
143− enableKeyFilter: root.active && valid
143+ enableKeyFilter: valid && root.active && root.enableMenus && !PanelState.decorationsVisible
144 unityMenuModel: root.menu
144 unityMenuModel: root.menu
145 }
145 }
146
146