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

Fixed window focus state drawing in ServerWindow::Show(). Changing focus with the mouse does not work, yet. Tomorrow, I'll fix that.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8058 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca
2004-06-18 22:27:46 +00:00
parent 604c4055c8
commit e26d667afe
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/server/ServerWindow.cpp
+22 -10
View File
@@ -289,7 +289,8 @@ void ServerWindow::Show(void)
rl->fMainLock.Lock();
STRACE(("ServerWindow(%s)::Show() - Main lock acquired\n", fWinBorder->GetName()));
// TODO: 'false' couldn't this be made otherwise???
// make WinBorder unhidden, but *do not* rebuild and redraw! We'll do that
// after we bring it (its modal and floating windows also) in front.
fWinBorder->Show(false);
if ( (fFeel == B_FLOATING_SUBSET_WINDOW_FEEL || fFeel == B_MODAL_SUBSET_WINDOW_FEEL)
@@ -305,19 +306,30 @@ void ServerWindow::Show(void)
{
if (fWorkspaces & (0x00000001UL << i))
{
Workspace *ws = rl->WorkspaceAt(i+1);
WinBorder *previousFocus;
BRegion invalidRegion;
Workspace *ws;
ws = rl->WorkspaceAt(i+1);
ws->BringToFrontANormalWindow(fWinBorder);
ws->SearchAndSetNewFront(fWinBorder);
previousFocus = ws->FocusLayer();
ws->SetFocusLayer(fWinBorder);
// TODO: this is UGLY.
// Normaly you have to easy pass a "FullInvalidate". But in this case, WinBorder
// is children dependant, so we CANOT rely on ANY region (full, fullVisible, visible)
// You have to figure out a way to do this 'internaly', I mean add support in
// Layer::FullInvalidate or Layer::[Start]RebuildRegions()
// What we are doinf here is BAD. We pass a rectangle instead of a region. Some areas may
// ger redrawed while there is no need for that!!!
fWinBorder->fParent->FullInvalidate(fWinBorder->fFull.Frame());
// first redraw previous window's decorator. It has lost focus state.
if (previousFocus)
if (previousFocus->fDecorator)
fWinBorder->fParent->Invalidate(previousFocus->fVisible);
// we must build the rebuild region. we have nowhere to take it from.
// include decorator's(if any) and fTopLayer's full regions.
fTopLayer->RebuildFullRegion();
fWinBorder->RebuildFullRegion();
invalidRegion.Include(&(fTopLayer->fFull));
if (fWinBorder->fDecorator)
invalidRegion.Include(&(fWinBorder->fFull));
fWinBorder->fParent->FullInvalidate(invalidRegion);
}
}
}