Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I took the liberty to revert Stefanos patch in 15953 since you all seem busy, it is ok and even required for the Desktop window to be able to have focus 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15970 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2006-01-16 11:44:18 +00:00
parent e2450cedbc
commit 7023b103b3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/servers/app/Desktop.cpp
View File

@ -897,8 +897,8 @@ Desktop::SetFocusWindow(WindowLayer* focus)
// TODO: test for FFM and B_LOCK_WINDOW_FOCUS
if ((focus == fFocus && focus != NULL && (focus->Flags() & B_AVOID_FOCUS) == 0
&& !hasModal) || focus->Feel() == kDesktopWindowFeel) {
if (focus == fFocus && focus != NULL && (focus->Flags() & B_AVOID_FOCUS) == 0
&& !hasModal) {
// the window that is supposed to get focus already has focus
UnlockAllWindows();
return;

6
src/servers/app/WindowLayer.cpp
View File

@ -823,7 +823,7 @@ WindowLayer::MouseDown(BMessage* message, BPoint where, int32* _viewToken)
DesktopSettings desktopSettings(fDesktop);
// Activate window in case it doesn't accept first click, and
// we're not in FFM mode, and it's not the desktop window
- // we're not in FFM mode
if ((Flags() & B_WILL_ACCEPT_FIRST_CLICK) == 0
&& desktopSettings.MouseMode() == B_NORMAL_MOUSE)
fDesktop->ActivateWindow(this);
@ -975,9 +975,7 @@ WindowLayer::MouseMoved(BMessage *msg, BPoint where, int32* _viewToken,
// change focus in FFM mode
DesktopSettings desktopSettings(fDesktop);
if (desktopSettings.MouseMode() != B_NORMAL_MOUSE && !IsFocus()
&& !(Flags() & B_AVOID_FOCUS) && Feel() != kDesktopWindowFeel)
if (desktopSettings.MouseMode() != B_NORMAL_MOUSE && !IsFocus() && !(Flags() & B_AVOID_FOCUS))
fDesktop->SetFocusWindow(this);
}