vlc | branch: master | Pierre Lamot <[email protected]> | Tue Jul 30 10:53:41 
2019 +0200| [901c2897723756f4c8ac76fa0c2676752b71837a] | committer: 
Jean-Baptiste Kempf

qml: player, don't forward accepted key events to the hotkeys

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=901c2897723756f4c8ac76fa0c2676752b71837a
---

 modules/gui/qt/qml/player/Player.qml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/gui/qt/qml/player/Player.qml 
b/modules/gui/qt/qml/player/Player.qml
index 7b72ee6c36..6ae036ec21 100644
--- a/modules/gui/qt/qml/player/Player.qml
+++ b/modules/gui/qt/qml/player/Player.qml
@@ -146,6 +146,8 @@ Utils.NavigableFocusScope {
             onActionCancel: rootPlayer.actionCancel(index)
 
             Keys.onPressed: {
+                if (event.accepted)
+                    return
                 if (event.key === Qt.Key_Menu) {
                     toolbarAutoHide.toggleForceVisible()
                 } else {
@@ -244,6 +246,8 @@ Utils.NavigableFocusScope {
 
                     //unhandled keys are forwarded as hotkeys
                     Keys.onPressed: {
+                        if (event.accepted)
+                            return
                         if (event.key === Qt.Key_Menu)
                             toolbarAutoHide.toggleForceVisible()
                         else

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to