From b9590dc919f70131fcbb1b064175b9e9b13350a6 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Thu, 6 Feb 2014 13:12:48 -0500 Subject: [PATCH] S&T: Activate S&T when only option down and not any other modifier such as command or control or shift. Fixes #10511 We need to be more strict here because Tracker defines Cmd+Opt+Up and Cmd+Opt+Down shortcuts, S&T shouldn't override them. --- src/servers/app/stackandtile/StackAndTile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/app/stackandtile/StackAndTile.cpp b/src/servers/app/stackandtile/StackAndTile.cpp index 33806ee7f9..4fe7bf297c 100644 --- a/src/servers/app/stackandtile/StackAndTile.cpp +++ b/src/servers/app/stackandtile/StackAndTile.cpp @@ -135,7 +135,7 @@ StackAndTile::KeyPressed(uint32 what, int32 key, int32 modifiers) // switch to and from stacking and snapping mode bool wasPressed = fSATKeyPressed; fSATKeyPressed = (what == B_MODIFIERS_CHANGED - && (modifiers & B_OPTION_KEY) != 0) + && (modifiers & 0xff) == B_OPTION_KEY) || (what == B_UNMAPPED_KEY_DOWN && key == kRightOptionKey); if (wasPressed && !fSATKeyPressed) _StopSAT();