i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check kAcceptKeyboardFocusFlag first.

Browse Source
This commit is contained in:
John Scipione
2013-01-25 03:17:29 -05:00
parent 70171c2634
commit 79fd9dac6c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/decorator/DefaultWindowBehaviour.cpp
+11 -11
View File
@@ -700,10 +700,10 @@ void
DefaultWindowBehaviour::ManageWindowState::EnterState(State* previousState) DefaultWindowBehaviour::ManageWindowState::EnterState(State* previousState)
{ {
// Update the mouse cursor // Update the mouse cursor
if ((fWindow->Flags() & B_NOT_MOVABLE) != 0) if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
fBehavior._SetNotAllowedCursor();
else if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
fBehavior._ResetCursor(); fBehavior._ResetCursor();
else if ((fWindow->Flags() & B_NOT_MOVABLE) != 0)
fBehavior._SetNotAllowedCursor();
else else
fBehavior._SetMoveCursor(); fBehavior._SetMoveCursor();
@@ -729,12 +729,12 @@ DefaultWindowBehaviour::ManageWindowState::MouseDown(BMessage* message,
where, false, false)); where, false, false));
} }
} else if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) { } else if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) {
if ((fWindow->Flags() & B_NOT_RESIZABLE) == 0) { if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
fBehavior._ResetCursor();
else if ((fWindow->Flags() & B_NOT_RESIZABLE) == 0) {
fBehavior._NextState(new (std::nothrow) ResizeBorderState( fBehavior._NextState(new (std::nothrow) ResizeBorderState(
fBehavior, where, fHorizontal, fVertical)); fBehavior, where, fHorizontal, fVertical));
} else if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0) } else
fBehavior._ResetCursor();
else
fBehavior._SetNotAllowedCursor(); fBehavior._SetNotAllowedCursor();
} }
@@ -747,13 +747,13 @@ DefaultWindowBehaviour::ManageWindowState::MouseMoved(BMessage* message,
BPoint where, bool isFake) BPoint where, bool isFake)
{ {
// Update the mouse cursor // Update the mouse cursor
if ((fDesktop->WindowAt(where)->Flags() & B_NOT_MOVABLE) != 0 if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
fBehavior._ResetCursor();
else if ((fDesktop->WindowAt(where)->Flags() & B_NOT_MOVABLE) != 0
|| ((fDesktop->WindowAt(where)->Flags() & B_NOT_RESIZABLE) != 0 || ((fDesktop->WindowAt(where)->Flags() & B_NOT_RESIZABLE) != 0
&& (message->FindInt32("buttons") & B_SECONDARY_MOUSE_BUTTON) != 0)) { && (message->FindInt32("buttons") & B_SECONDARY_MOUSE_BUTTON) != 0)) {
fBehavior._SetNotAllowedCursor(); fBehavior._SetNotAllowedCursor();
} else if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0) } else
fBehavior._ResetCursor();
else
fBehavior._SetMoveCursor(); fBehavior._SetMoveCursor();
// If the cursor is still over our window, update the borders. // If the cursor is still over our window, update the borders.