* The direct connection update in ServerWindow::{_Show()|_Hide()} is superfluous
since Korli's change in r30440. * 80 character per line limit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30579 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1898,7 +1898,8 @@ Desktop::_ShowWindow(Window* window, bool affectsOtherWindows)
|
|||||||
} else
|
} else
|
||||||
MarkDirty(dirty);
|
MarkDirty(dirty);
|
||||||
|
|
||||||
window->ServerWindow()->HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESET);
|
window->ServerWindow()->HandleDirectConnection(
|
||||||
|
B_DIRECT_START | B_BUFFER_RESET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -385,9 +385,6 @@ ServerWindow::_Show()
|
|||||||
fDesktop->UnlockSingleWindow();
|
fDesktop->UnlockSingleWindow();
|
||||||
fDesktop->ShowWindow(fWindow);
|
fDesktop->ShowWindow(fWindow);
|
||||||
fDesktop->LockSingleWindow();
|
fDesktop->LockSingleWindow();
|
||||||
|
|
||||||
if (fDirectWindowData != NULL)
|
|
||||||
HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESET);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -397,15 +394,11 @@ ServerWindow::_Show()
|
|||||||
void
|
void
|
||||||
ServerWindow::_Hide()
|
ServerWindow::_Hide()
|
||||||
{
|
{
|
||||||
// NOTE: if you do something else, other than sending a port message, PLEASE lock
|
|
||||||
STRACE(("ServerWindow %s: _Hide\n", Title()));
|
STRACE(("ServerWindow %s: _Hide\n", Title()));
|
||||||
|
|
||||||
if (fWindow->IsHidden() || fWindow->IsOffscreenWindow())
|
if (fWindow->IsHidden() || fWindow->IsOffscreenWindow())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (fDirectWindowData != NULL)
|
|
||||||
HandleDirectConnection(B_DIRECT_STOP);
|
|
||||||
|
|
||||||
fDesktop->UnlockSingleWindow();
|
fDesktop->UnlockSingleWindow();
|
||||||
fDesktop->HideWindow(fWindow);
|
fDesktop->HideWindow(fWindow);
|
||||||
fDesktop->LockSingleWindow();
|
fDesktop->LockSingleWindow();
|
||||||
|
|||||||
Reference in New Issue
Block a user