github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.developing rainbow

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3709 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-07-24 18:40:06 +00:00
parent 5a79d85002
commit 9dc01f3f2b
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rainbow/Framebuffer/Ctrl.h
View file

@ -34,6 +34,8 @@ private:
static void AddInvalid(const Rect& rect);
void DestroyWnd();
void NewTop() { top = new Top; top->owner_window = NULL; }
void PutForeground();
static void MouseEventFB(Ptr<Ctrl> t, int event, Point p, int zdelta);

2
rainbow/Framebuffer/Top.cpp
View file

@ -14,7 +14,7 @@ void TopWindow::SyncFrameRect(const Rect& r)
void TopWindow::DestroyFrame()
{
if(frame->IsOpen())
frame->Close();
frame->DestroyWnd();
}
void TopWindow::GripResize()

9
rainbow/Framebuffer/Wnd.cpp
View file

@ -533,7 +533,7 @@ int Ctrl::GetKbdSpeed()
return 1000 / 32;
}
void Ctrl::WndDestroy0()
void Ctrl::DestroyWnd()
{
for(int i = 0; i < topctrl.GetCount(); i++)
if(topctrl[i]->top && topctrl[i]->top->owner_window == this)
@ -551,8 +551,13 @@ void Ctrl::WndDestroy0()
TopWindow *win = dynamic_cast<TopWindow *>(this);
if(win)
win->DestroyFrame();
}
void Ctrl::WndDestroy0()
{
DestroyWnd();
if(topctrl.GetCount())
topctrl.Top()->SetWndForeground0();
topctrl.Top()->ActivateWnd();
}
void Ctrl::PutForeground()