github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-24 14:22:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.developing rainbow

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3697 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-07-22 13:54:51 +00:00
parent 2a834f47e5
commit 5c66e7e8fe
1 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rainbow/Framebuffer/Wnd.cpp
View file

@ -347,7 +347,6 @@ void Ctrl::DragRectDraw(const Rect& rect1, const Rect& rect2, const Rect& clip,
void Ctrl::DoPaint()
{
LLOG("@ DoPaint");
<<<<<<< .mine
if(!PaintLock) {
bool scroll = false;
if(desktop)
@ -365,35 +364,6 @@ void Ctrl::DoPaint()
for(int i = 0; i < invalid.GetCount(); i++) {
painter.RectPath(invalid[i]);
AddUpdate(invalid[i]);
=======
bool scroll = false;
if(desktop)
desktop->SyncScroll();
for(int i = 0; i < topctrl.GetCount(); i++)
topctrl[i]->SyncScroll();
if((invalid.GetCount() || scroll) && desktop) {
RemoveCursor();
RemoveCaret();
for(int phase = 0; phase < 2; phase++) {
LLOG("DoPaint invalid phase " << phase);
LDUMPC(invalid);
SystemDraw painter;
painter.Begin();
for(int i = 0; i < invalid.GetCount(); i++) {
painter.RectPath(invalid[i]);
AddUpdate(invalid[i]);
}
painter.Painter::Clip();
for(int i = topctrl.GetCount() - 1; i >= 0; i--) {
Rect r = topctrl[i]->GetRect();
Rect ri = GetClipBound(invalid, r);
if(!IsNull(ri)) {
painter.Clipoff(r);
topctrl[i]->UpdateArea(painter, ri - r.TopLeft());
painter.End();
Subtract(invalid, r);
painter.ExcludeClip(r);
>>>>>>> .r3695
}
painter.Painter::Clip();
for(int i = topctrl.GetCount() - 1; i >= 0; i--) {