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

In FFM mode always update the focus in MouseMoved() regardless of the state.

Browse Source 
I broke that with r39608.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39629 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-11-25 16:41:22 +00:00
parent 8d25a74c68
commit 2ee2a8ede4
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/DefaultWindowBehaviour.cpp
+10 -19
View File
@@ -70,19 +70,6 @@ struct DefaultWindowBehaviour::State {
{ {
} }
void UpdateFFMFocus(bool isFake)
{
// change focus in FFM mode
DesktopSettings desktopSettings(fDesktop);
if (desktopSettings.FocusFollowsMouse()
&& !fWindow->IsFocus() && !(fWindow->Flags() & B_AVOID_FOCUS)) {
// If the mouse move is a fake one, we set the focus to NULL, which
// will cause the window that had focus last to retrieve it again - this
// makes FFM much nicer to use with the keyboard.
fDesktop->SetFocusWindow(isFake ? NULL : fWindow);
}
}
protected: protected:
DefaultWindowBehaviour& fBehavior; DefaultWindowBehaviour& fBehavior;
Window* fWindow; Window* fWindow;
@@ -184,9 +171,6 @@ struct DefaultWindowBehaviour::MouseTrackingState : State {
// set the new mouse position // set the new mouse position
fLastMousePosition += delta; fLastMousePosition += delta;
// update the FFM focus
UpdateFFMFocus(isFake);
} }
virtual void MouseMovedAction(BPoint& delta, bigtime_t now) virtual void MouseMovedAction(BPoint& delta, bigtime_t now)
@@ -574,9 +558,6 @@ struct DefaultWindowBehaviour::DecoratorButtonState : State {
virtual void MouseMoved(BMessage* message, BPoint where, bool isFake) virtual void MouseMoved(BMessage* message, BPoint where, bool isFake)
{ {
_RedrawDecorator(message); _RedrawDecorator(message);
// update the FFM focus
UpdateFFMFocus(isFake);
} }
private: private:
@@ -831,6 +812,16 @@ DefaultWindowBehaviour::MouseMoved(BMessage *message, BPoint where, bool isFake)
{ {
if (fState != NULL) if (fState != NULL)
fState->MouseMoved(message, where, isFake); fState->MouseMoved(message, where, isFake);
// change focus in FFM mode
DesktopSettings desktopSettings(fDesktop);
if (desktopSettings.FocusFollowsMouse()
&& !fWindow->IsFocus() && !(fWindow->Flags() & B_AVOID_FOCUS)) {
// If the mouse move is a fake one, we set the focus to NULL, which
// will cause the window that had focus last to retrieve it again - this
// makes FFM much nicer to use with the keyboard.
fDesktop->SetFocusWindow(isFake ? NULL : fWindow);
}
} }