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

Merged master

Browse source
This commit is contained in:
Mirek Fidler 2022-09-15 20:03:43 +02:00
commit c0cb4bcdc9
87 changed files with 3406 additions and 2068 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -951,8 +951,12 @@ Size ArrayCtrl::DoPaint(Draw& w, bool sample) {
dword st;
Color fg, bg;
Value q;
bool heading = IsHeading(i);
const Display& d = GetCellInfo(i, jj, hasfocus0, q, fg, bg, st);
if(sample || w.IsPainting(r)) {
if(heading)
r.right = cw = size.cx;
else
if(spanwidecells)
SpanWideCell(d, q, cm, cw, r, i, j);
@ -971,6 +975,8 @@ Size ArrayCtrl::DoPaint(Draw& w, bool sample) {
x += cw;
if(vertgrid)
w.DrawRect(x - 1, r.top, 1, r.Height(), gridcolor);
if(heading)
break;
}
if(horzgrid)
w.DrawRect(0, r.bottom, size.cx, 1, gridcolor);
@ -2151,6 +2157,14 @@ void ArrayCtrl::AddSeparator()
DisableLine(ii);
}
void ArrayCtrl::AddHeading(const Value& v)
{
int ii = GetCount();
Add(v);
array.At(ii).heading = true;
DisableLine(ii);
}
#define E__Addv(I) Set0(q, I - 1, p##I)
#define E__AddF(I) \
void ArrayCtrl::Add(__List##I(E__Value)) { \