From 7286c86c3901db167e044ec0d0d21414742d2cb4 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 1 Aug 2011 10:50:37 +0000 Subject: [PATCH] Disable group keyboard navigation for now. Don't start a S&T operation if the right button is down. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42532 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/StackAndTile/StackAndTile.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/servers/app/StackAndTile/StackAndTile.cpp b/src/servers/app/StackAndTile/StackAndTile.cpp index 00a4fcba02..2f26ab75e6 100644 --- a/src/servers/app/StackAndTile/StackAndTile.cpp +++ b/src/servers/app/StackAndTile/StackAndTile.cpp @@ -129,7 +129,8 @@ StackAndTile::KeyPressed(uint32 what, int32 key, int32 modifiers) if (!wasPressed && fSATKeyPressed) _StartSAT(); } - +// switch off group navigation because it clashes with tracker... +return false; if (!SATKeyPressed() || (modifiers & B_COMMAND_KEY) == 0 || what != B_KEY_DOWN) return false; @@ -218,6 +219,12 @@ StackAndTile::MouseDown(Window* window, BMessage* message, const BPoint& where) if (!satWindow || !satWindow->GetDecorator()) return; + // fCurrentSATWindow is not zero if e.g. the secondary and the primary + // mouse button are pressed at the same time + if ((message->FindInt32("buttons") & B_PRIMARY_MOUSE_BUTTON) == 0 || + fCurrentSATWindow != NULL) + return; + // we are only interested in single clicks if (message->FindInt32("clicks") == 2) return;