github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cosmetics

Browse source
This commit is contained in:
Mirek Fidler 2025-06-20 18:26:06 +02:00
parent c9d931e166
commit c4d2e52a83
2 changed files with 1 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlCore/CtrlCore.h
View file

@ -688,7 +688,6 @@ private:
void CtrlPaint(SystemDraw& w, const Rect& clip);
void RemoveFullRefresh();
static void FullRefreshCleanup();
bool PaintOpaqueAreas(SystemDraw& w, const Rect& r, const Rect& clip, bool nochild = false);
void GatherTransparentAreas(Vector<Rect>& area, SystemDraw& w, Rect r, const Rect& clip);
void ExcludeDHCtrls(SystemDraw& w, const Rect& r, const Rect& clip);
void UpdateArea0(SystemDraw& draw, const Rect& clip, int backpaint);

62
uppsrc/CtrlCore/CtrlDraw.cpp
View file

@ -372,71 +372,11 @@ void ShowRepaintRect(SystemDraw& w, const Rect& r, Color c)
}
}
bool Ctrl::PaintOpaqueAreas(SystemDraw& w, const Rect& r, const Rect& clip, bool nochild)
{
GuiLock __;
LTIMING("PaintOpaqueAreas");
if(!IsShown() || r.IsEmpty() || !r.Intersects(clip) || !w.IsPainting(r))
return true;
Point off = r.TopLeft();
Point viewpos = off + GetView().TopLeft();
if(backpaint == EXCLUDEPAINT)
return w.ExcludeClip(r);
Rect cview = clip & (GetView() + off);
for(Ctrl& q : *this)
if(!q.PaintOpaqueAreas(w, q.GetRect() + (q.InView() ? viewpos : off),
q.InView() ? cview : clip))
return false;
if(nochild && (GetLastChild() || GetNext()))
return true;
Rect opaque = (GetOpaqueRect() + viewpos) & clip;
if(opaque.IsEmpty())
return true;
#ifdef SYSTEMDRAW
if(backpaint == FULLBACKPAINT && !dynamic_cast<BackDraw *>(&w))
#else
if(backpaint == FULLBACKPAINT && !w.IsBack())
#endif
{
ShowRepaintRect(w, opaque, LtRed());
BackDraw bw;
bw.Create(w, opaque.GetSize());
bw.Offset(viewpos - opaque.TopLeft());
bw.SetPaintingDraw(w, opaque.TopLeft());
{
LEVELCHECK(bw, this);
Paint(bw);
PaintCaret(bw);
DOLEVELCHECK;
}
bw.Put(w, opaque.TopLeft());
}
else {
w.Clip(opaque);
ShowRepaintRect(w, opaque, Green());
w.Offset(viewpos);
{
LEVELCHECK(w, this);
Paint(w);
PaintCaret(w);
DOLEVELCHECK;
}
w.End();
w.End();
}
LLOG("Exclude " << opaque);
return w.ExcludeClip(opaque);
}
inline int Area(const Rect& r)
{
return r.GetHeight() * r.GetWidth();
}
void CombineArea(Vector<Rect>& area, const Rect& r)
{
LTIMING("CombineArea");
if(r.IsEmpty()) return;
auto Area = [](const Rect& r) { return r.GetHeight() * r.GetWidth(); };
int ra = Area(r);
for(int i = 0; i < area.GetCount(); i++) {
Rect ur = r | area[i];