diff mbox series

ui/cocoa: Respect left-command-key option

Message ID 20220317152949.68666-1-akihiko.odaki@gmail.com
State New
Headers show
Series ui/cocoa: Respect left-command-key option | expand

Commit Message

Akihiko Odaki March 17, 2022, 3:29 p.m. UTC 
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
 ui/cocoa.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé March 17, 2022, 6:02 p.m. UTC | #1 
On 17/3/22 16:29, Akihiko Odaki wrote:
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
>   ui/cocoa.m | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index cb6e7c41dc6..c4e5468f9e6 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -923,7 +923,8 @@ - (bool) handleEventLocked:(NSEvent *)event
>                   /* Don't pass command key changes to guest unless mouse is grabbed */
>                   case kVK_Command:
>                       if (isMouseGrabbed &&
> -                        !!(modifiers & NSEventModifierFlagCommand)) {
> +                        !!(modifiers & NSEventModifierFlagCommand) &&
> +                        left_command_key_enabled) {

My bad for trying to resolve merge conflict myself sigh :(

Fixes: 4797adce5f ("ui/cocoa: add option to swap Option and Command")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>                           if (swap_opt_cmd) {
>                               [self toggleKey:Q_KEY_CODE_ALT];
>                           } else {
Philippe Mathieu-Daudé March 28, 2022, 10:28 p.m. UTC | #2 
On 17/3/22 16:29, Akihiko Odaki wrote:
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
>   ui/cocoa.m | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Thanks, queued to darwin-fixes.
diff mbox series

Patch

diff --git a/ui/cocoa.m b/ui/cocoa.m
index cb6e7c41dc6..c4e5468f9e6 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -923,7 +923,8 @@  - (bool) handleEventLocked:(NSEvent *)event
                 /* Don't pass command key changes to guest unless mouse is grabbed */
                 case kVK_Command:
                     if (isMouseGrabbed &&
-                        !!(modifiers & NSEventModifierFlagCommand)) {
+                        !!(modifiers & NSEventModifierFlagCommand) &&
+                        left_command_key_enabled) {
                         if (swap_opt_cmd) {
                             [self toggleKey:Q_KEY_CODE_ALT];
                         } else {