[haiku-commits] haiku: hrev45202 - src/servers/app/decorator
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 25 Jan 2013 09:17:56 +0100 (CET)
hrev45202 adds 1 changeset to branch 'master'
old head: 70171c2634284513118df15f152d0763a5be195f
new head: 79fd9dac6ca77831d161aaa6c0b0976e1507f0f1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=79fd9da+%5E70171c2
----------------------------------------------------------------------------
79fd9da: Check kAcceptKeyboardFocusFlag first.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45202
Commit: 79fd9dac6ca77831d161aaa6c0b0976e1507f0f1
URL: http://cgit.haiku-os.org/haiku/commit/?id=79fd9da
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jan 25 08:17:29 2013 UTC
----------------------------------------------------------------------------
1 file changed, 11 insertions(+), 11 deletions(-)
.../app/decorator/DefaultWindowBehaviour.cpp | 22 ++++++++++----------
----------------------------------------------------------------------------
diff --git a/src/servers/app/decorator/DefaultWindowBehaviour.cpp
b/src/servers/app/decorator/DefaultWindowBehaviour.cpp
index f28d366..3969831 100644
--- a/src/servers/app/decorator/DefaultWindowBehaviour.cpp
+++ b/src/servers/app/decorator/DefaultWindowBehaviour.cpp
@@ -700,10 +700,10 @@ void
DefaultWindowBehaviour::ManageWindowState::EnterState(State* previousState)
{
// Update the mouse cursor
- if ((fWindow->Flags() & B_NOT_MOVABLE) != 0)
- fBehavior._SetNotAllowedCursor();
- else if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
+ if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
fBehavior._ResetCursor();
+ else if ((fWindow->Flags() & B_NOT_MOVABLE) != 0)
+ fBehavior._SetNotAllowedCursor();
else
fBehavior._SetMoveCursor();
@@ -729,12 +729,12 @@
DefaultWindowBehaviour::ManageWindowState::MouseDown(BMessage* message,
where, false, false));
}
} 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, where, fHorizontal, fVertical));
- } else if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
- fBehavior._ResetCursor();
- else
+ } else
fBehavior._SetNotAllowedCursor();
}
@@ -747,13 +747,13 @@
DefaultWindowBehaviour::ManageWindowState::MouseMoved(BMessage* message,
BPoint where, bool isFake)
{
// 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
&& (message->FindInt32("buttons") & B_SECONDARY_MOUSE_BUTTON)
!= 0)) {
fBehavior._SetNotAllowedCursor();
- } else if ((fWindow->Flags() & kAcceptKeyboardFocusFlag) != 0)
- fBehavior._ResetCursor();
- else
+ } else
fBehavior._SetMoveCursor();
// If the cursor is still over our window, update the borders.
Other related posts:
- » [haiku-commits] haiku: hrev45202 - src/servers/app/decorator - jscipione
