From 7023b103b34be0ef57d137979ce8f2521b9fa3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 16 Jan 2006 11:44:18 +0000 Subject: [PATCH] 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 --- src/servers/app/Desktop.cpp | 4 ++-- src/servers/app/WindowLayer.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index f9c3e5155e..e578e74225 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -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; diff --git a/src/servers/app/WindowLayer.cpp b/src/servers/app/WindowLayer.cpp index 75f25bcf46..81c6dc813e 100644 --- a/src/servers/app/WindowLayer.cpp +++ b/src/servers/app/WindowLayer.cpp @@ -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); }