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

* Minor simplification and clarification.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28650 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-11-14 13:44:25 +00:00
parent d02835660f
commit 0c9593acdc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Desktop.cpp
+5 -3
View File
@@ -1568,8 +1568,7 @@ Desktop::ActivateWindow(Window* window)
fFront = NULL; fFront = NULL;
return; return;
} }
if (window->Workspaces() == 0 if (window->Workspaces() == 0 && window->IsNormal())
&& !window->IsFloating() && !window->IsModal())
return; return;
AutoWriteLocker _(fWindowLock); AutoWriteLocker _(fWindowLock);
@@ -1594,7 +1593,7 @@ Desktop::ActivateWindow(Window* window)
} }
if (windowOnOtherWorkspace) { if (windowOnOtherWorkspace) {
if (window->IsFloating() || window->IsModal()) { if (!window->IsNormal()) {
// Bring a window to front that this floating window belongs to // Bring a window to front that this floating window belongs to
Window* front = _LastFocusSubsetWindow(window); Window* front = _LastFocusSubsetWindow(window);
if (front == NULL) { if (front == NULL) {
@@ -1734,6 +1733,9 @@ Desktop::ShowWindow(Window* window)
window->SetHidden(false); window->SetHidden(false);
fFocusList.AddWindow(window); fFocusList.AddWindow(window);
// If the window is on the current workspace, we'll show it. Special
// handling for floating windows, as they can only be shown if their
// subset is.
if (window->InWorkspace(fCurrentWorkspace) if (window->InWorkspace(fCurrentWorkspace)
|| (window->IsFloating() && _LastFocusSubsetWindow(window) != NULL)) { || (window->IsFloating() && _LastFocusSubsetWindow(window) != NULL)) {
_ShowWindow(window, true); _ShowWindow(window, true);