Fixed ActionContext scopes
commitb108ceaac5981d95bd6818536b48683486351b95
authorNick Dedekind <nick.dedekind@canonical.com>
dateThu 20 Oct 2016, 15:58 (10 years ago)
parent6df9d2d
qml/ApplicationMenus/MenuBar.qml+1−1
@@ -69,7 +69,7 @@ Item {
6969 ActionContext {
7070 id: menuBarContext
7171 objectName: "barContext"
72− active: !d.currentItem
72+ active: !d.currentItem && enableKeyFilter
7373 }
7474
7575 Repeater {
qml/Stage/WindowDecoration.qml+1−1
@@ -140,7 +140,7 @@ MouseArea {
140140 sourceComponent: MenuBar {
141141 id: menuBar
142142 height: menuBarLoader.height
143− enableKeyFilter: root.active && valid
143+ enableKeyFilter: valid && root.active && root.enableMenus && !PanelState.decorationsVisible
144144 unityMenuModel: root.menu
145145 }
146146