Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert my last changes for now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38486 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler 2010-09-01 02:52:33 +00:00
parent 1f4a2bd985
commit cd4692196c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/servers/app/Desktop.cpp
View File

@ -1032,7 +1032,7 @@ Desktop::SendWindowBehind(Window* window, Window* behindOf)
// TODO: should the "not in current workspace" be handled anyway?
// (the code below would have to be changed then, though)
if ((behindOf == NULL && window == BackWindow())
if (window == BackWindow()
|| !window->InWorkspace(fCurrentWorkspace)
|| (behindOf != NULL && !behindOf->InWorkspace(fCurrentWorkspace))) {
UnlockAllWindows();
@ -1047,21 +1047,18 @@ Desktop::SendWindowBehind(Window* window, Window* behindOf)
// might be dirty after the window is send to back
BRegion dirty(window->VisibleRegion());
Window* backmost = window->Backmost(behindOf);
CurrentWindows().RemoveWindow(window);
CurrentWindows().AddWindow(window, behindOf
? behindOf : BackWindow());
CurrentWindows().AddWindow(window, backmost
? backmost->NextWindow(fCurrentWorkspace) : BackWindow());
BRegion dummy;
_RebuildClippingForAllWindows(dummy);
// if we send a window to the bottom mark everything dirty that is no
// longer visible, if behindOf is not NULL the window may has rose so
// include the visible region
// mark everything dirty that is no longer visible
BRegion clean(window->VisibleRegion());
if (!behindOf)
dirty.Exclude(&clean);
else
dirty.Include(&clean);
dirty.Exclude(&clean);
MarkDirty(dirty);
_UpdateFronts();