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

GridCtrl: Fixed painting columns with null header font

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3712 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2011-07-25 15:38:50 +00:00
parent 55cc138226
commit 595e7599de
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -1175,7 +1175,7 @@ void GridCtrl::Paint(Draw &w)
gd->SetLeftImage(hi.img);
gd->PaintFixed(w, jj == firstcol, i == 0, x, y, cx, cy,
i == 0 ? it.val : GetConvertedColumn(hi.id, it.val),
style | en, hi.hfnt, false, false,
style | en, IsNull(hi.hfnt) ? StdFont() : hi.hfnt, false, false,
i == 0 ? hi.sortmode : 0,
hi.sortcol,
sortOrder.GetCount(),
@ -1303,7 +1303,7 @@ void GridCtrl::Paint(Draw &w)
gd->PaintFixed(w, firstx, j == 0, x, y, cx, cy,
GetConvertedColumn(id, it.val),
style | en, vi.hfnt,
style | en, IsNull(vi.hfnt) ? StdFont() : vi.hfnt,
indicator, false, 0, -1, 0, false);
it.rcx = gd->real_size.cx;
@ -1359,14 +1359,7 @@ void GridCtrl::Paint(Draw &w)
if(x < sz.cx) w.DrawRect(Rect(max(x, rc.left), max(fixed_height, rc.top), sz.cx, sz.cy), SColorPaper);
if(y < sz.cy) w.DrawRect(Rect(max(fixed_width, rc.left), max(y, rc.top), sz.cx, sz.cy), SColorPaper);
/*
if(fixed_rows <= total_rows)
{
w.DrawText(
}
*/
bool hasfocus = HasFocus/*Deep*/() || holder.HasFocusDeep();
bool hasfocus = HasFocus() || holder.HasFocusDeep();
for(i = max(firstRow, fixed_rows); i < total_rows; i++)
{