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

When the last window was removed with floating windows on screen, they wouldn't

Browse Source 
be closed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16639 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-03-08 12:56:56 +00:00
parent 2c9acb6697
commit 1bbdbf9cda
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Desktop.cpp
+4 -5
View File
@@ -847,9 +847,6 @@ Desktop::_Windows(int32 index)
void void
Desktop::_UpdateFloating(int32 previousWorkspace, int32 nextWorkspace) Desktop::_UpdateFloating(int32 previousWorkspace, int32 nextWorkspace)
{ {
if (fFront == NULL)
return;
if (previousWorkspace == -1) if (previousWorkspace == -1)
previousWorkspace = fCurrentWorkspace; previousWorkspace = fCurrentWorkspace;
if (nextWorkspace == -1) if (nextWorkspace == -1)
@@ -862,7 +859,7 @@ Desktop::_UpdateFloating(int32 previousWorkspace, int32 nextWorkspace)
&& floating->Feel() != B_FLOATING_APP_WINDOW_FEEL) && floating->Feel() != B_FLOATING_APP_WINDOW_FEEL)
continue; continue;
if (fFront->IsNormal() && floating->HasInSubset(fFront)) { if (fFront != NULL && fFront->IsNormal() && floating->HasInSubset(fFront)) {
// is now visible // is now visible
if (_Windows(previousWorkspace).HasWindow(floating) if (_Windows(previousWorkspace).HasWindow(floating)
&& previousWorkspace != nextWorkspace) { && previousWorkspace != nextWorkspace) {
@@ -1101,7 +1098,7 @@ Desktop::_BringWindowsToFront(WindowList& windows, int32 list,
void void
Desktop::ActivateWindow(WindowLayer* window) Desktop::ActivateWindow(WindowLayer* window)
{ {
// printf("ActivateWindow(%p, %s)\n", window, window ? window->Title() : "<none>"); STRACE(("ActivateWindow(%p, %s)\n", window, window ? window->Title() : "<none>"));
// TODO: handle this case correctly! (ie. honour B_NOT_ANCHORED_ON_ACTIVATE, // TODO: handle this case correctly! (ie. honour B_NOT_ANCHORED_ON_ACTIVATE,
// B_NO_WORKSPACE_ACTIVATION, switch workspaces, ...) // B_NO_WORKSPACE_ACTIVATION, switch workspaces, ...)
@@ -1439,6 +1436,8 @@ Desktop::ResizeWindowBy(WindowLayer* window, float x, float y)
void void
Desktop::_UpdateSubsetWorkspaces(WindowLayer* window) Desktop::_UpdateSubsetWorkspaces(WindowLayer* window)
{ {
STRACE(("_UpdateSubsetWorkspaces(window %p, %s)\n", window, window->Title()));
// if the window is hidden, the subset windows are up-to-date already // if the window is hidden, the subset windows are up-to-date already
if (!window->IsNormal() || window->IsHidden()) if (!window->IsNormal() || window->IsHidden())
return; return;