From e4228c37603d96c787cacce88c55edd019f00478 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 27 Jul 2011 03:24:53 +0000 Subject: [PATCH] Also make the right option key working as a S&T key. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42506 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/StackAndTile/StackAndTile.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/servers/app/StackAndTile/StackAndTile.cpp b/src/servers/app/StackAndTile/StackAndTile.cpp index b2a4ef1625..00a4fcba02 100644 --- a/src/servers/app/StackAndTile/StackAndTile.cpp +++ b/src/servers/app/StackAndTile/StackAndTile.cpp @@ -115,10 +115,15 @@ StackAndTile::WindowRemoved(Window* window) bool StackAndTile::KeyPressed(uint32 what, int32 key, int32 modifiers) { - // switch to and from stacking and snapping mode - if (what == B_MODIFIERS_CHANGED) { + const int32 kRightOptionKey = 103; + if (what == B_MODIFIERS_CHANGED + || (what == B_UNMAPPED_KEY_DOWN && key == kRightOptionKey) + || (what == B_UNMAPPED_KEY_UP && key == kRightOptionKey)) { + // switch to and from stacking and snapping mode bool wasPressed = fSATKeyPressed; - fSATKeyPressed = modifiers & B_OPTION_KEY; + fSATKeyPressed = (what == B_MODIFIERS_CHANGED + && modifiers & B_OPTION_KEY) + || (what == B_UNMAPPED_KEY_DOWN && key == kRightOptionKey); if (wasPressed && !fSATKeyPressed) _StopSAT(); if (!wasPressed && fSATKeyPressed)