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

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

Browse Source 
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
This commit is contained in:
Axel Dörfler
2006-04-17 13:23:45 +00:00
parent aacfed124b
commit aca623bd06
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Desktop.cpp
+4 -2
View File
@@ -1223,7 +1223,8 @@ Desktop::ActivateWindow(WindowLayer* window)
if (avoidsFront == NULL) { if (avoidsFront == NULL) {
// we're already the frontmost window, we might just not have focus yet // 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(); UnlockAllWindows();
return; return;
@@ -1261,7 +1262,8 @@ Desktop::ActivateWindow(WindowLayer* window)
} }
_BringWindowsToFront(windows, kWorkingList, true); _BringWindowsToFront(windows, kWorkingList, true);
SetFocusWindow(window); if ((window->Flags() & B_AVOID_FOCUS) == 0)
SetFocusWindow(window);
UnlockAllWindows(); UnlockAllWindows();
} }