Activating a window with B_AVOID_FOCUS set no longer changes focus - this prevents

the desktop window from losing focus when a menu opens.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17151 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/servers/app/Desktop.cpp

@@ -1223,7 +1223,8 @@ Desktop::ActivateWindow(WindowLayer* window)
 
 		if (avoidsFront == NULL) {
 			// we're already the frontmost window, we might just not have focus yet
-			SetFocusWindow(window);
+			if ((window->Flags() & B_AVOID_FOCUS) == 0)
+				SetFocusWindow(window);
 
 			UnlockAllWindows();
 			return;
@@ -1261,7 +1262,8 @@ Desktop::ActivateWindow(WindowLayer* window)
 	}
 
 	_BringWindowsToFront(windows, kWorkingList, true);
-	SetFocusWindow(window);
+	if ((window->Flags() & B_AVOID_FOCUS) == 0)
+		SetFocusWindow(window);
 
 	UnlockAllWindows();
 }