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

GridCtrl: Fixed displaying AttrText of values from embedded controls

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6039 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2013-05-08 15:39:22 +00:00
parent e28f58a517
commit fc9980df38
3 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

50
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -993,22 +993,14 @@ void GridCtrl::DrawLine(bool iniLine, bool delLine)
Value GridCtrl::GetItemValue(const Item& it, int id, const ItemRect& hi, const ItemRect& vi)
{
Value val;
if(IsType<AttrText>(it.val))
{
const AttrText& t = ValueTo<AttrText>(it.val);
val = t.text;
}
else
val = hi.IsConvertion() && vi.IsConvertion()
? GetConvertedColumn(id, it.val)
: it.val;
Value val = hi.IsConvertion() && vi.IsConvertion()
? GetConvertedColumn(id, it.val)
: it.val;
return val;
}
void GridCtrl::GetItemAttrs(const Item& it, int r, int c, const ItemRect& vi, const ItemRect& hi, dword& style, GridDisplay*& gd, Color& fg, Color& bg, Font& fnt)
void GridCtrl::GetItemAttrs(const Item& it, const Value& value, int r, int c, const ItemRect& vi, const ItemRect& hi, dword& style, GridDisplay*& gd, Color& fg, Color& bg, Font& fnt)
{
if(!IsNull(vi.fg))
fg = vi.fg;
@ -1029,11 +1021,21 @@ void GridCtrl::GetItemAttrs(const Item& it, int r, int c, const ItemRect& vi, co
else if(!IsNull(vi.fnt))
fnt = vi.fnt;
else if(!IsNull(hi.fnt))
fnt = hi.fnt;
fnt = hi.fnt;
if(IsType<AttrText>(it.val))
GridDisplay * hd = hi.display;
GridDisplay * vd = vi.display;
gd = display;
if(!hi.ignore_display && !vi.ignore_display)
gd = vd ? vd : (hd ? hd : (it.display ? it.display : display));
gd->SetLeftImage(Null);
const Value& val = IsNull(value) ? it.val : value;
if(IsType<AttrText>(val))
{
const AttrText& t = ValueTo<AttrText>(it.val);
const AttrText& t = ValueTo<AttrText>(val);
if(!IsNull(t.paper)) bg = t.paper;
if(!IsNull(t.ink)) fg = t.ink;
@ -1050,13 +1052,10 @@ void GridCtrl::GetItemAttrs(const Item& it, int r, int c, const ItemRect& vi, co
style &= ~GD::HALIGN;
style |= s;
}
if(!IsNull(t.img))
gd->SetLeftImage(t.img);
}
GridDisplay * hd = hi.display;
GridDisplay * vd = vi.display;
gd = display;
if(!hi.ignore_display && !vi.ignore_display)
gd = vd ? vd : (hd ? hd : (it.display ? it.display : display));
}
GridCtrl::Item& GridCtrl::GetItemSize(int &r, int &c, int &x, int &y, int &cx, int &cy, bool &skip, bool relx, bool rely)
@ -1442,7 +1441,7 @@ void GridCtrl::Paint(Draw &w)
Font fnt = StdFont();
GridDisplay* gd;
Value val = GetItemValue(it, id, hi, vi);
GetItemAttrs(it, i, j, vi, hi, style, gd, cfg, cbg, fnt);
GetItemAttrs(it, val, i, j, vi, hi, style, gd, cfg, cbg, fnt);
Color fg = SColorText;
Color bg = SColorPaper;
@ -1508,6 +1507,13 @@ void GridCtrl::Paint(Draw &w)
gd->col = j - fixed_rows;
gd->row = i - fixed_cols;
gd->parent = this;
if(IsType<AttrText>(val))
{
const AttrText& t = ValueTo<AttrText>(val);
val = t.text;
}
gd->Paint(w, x, y, cx, cy,
val, style,
fg, bg, fnt, it.style & GD::FOUND, it.fs, it.fe);
@ -2053,7 +2059,7 @@ void GridCtrl::SyncPopup()
int x = hi.npos + p0.x - p.x - 1 - sbx.Get() * int(!fc);
int y = vi.npos + p0.y - p.y - 1 - sby.Get() * int(!fr);
GetItemAttrs(it, r, c, vi, hi, popup.style, popup.gd, popup.fg, popup.bg, popup.fnt);
GetItemAttrs(it, Null, r, c, vi, hi, popup.style, popup.gd, popup.fg, popup.bg, popup.fnt);
popup.gd->row = r < fixed_rows ? -1 : r - fixed_rows;
popup.gd->col = c < fixed_cols ? -1 : c - fixed_cols;
Rect scr = GetWorkArea();

2
uppsrc/GridCtrl/GridCtrl.h
View file

@ -1762,7 +1762,7 @@ class GridCtrl : public Ctrl
int GetIdCol(int id, bool checkall = false) const;
int GetIdRow(int id, bool checkall = false) const;
Value GetItemValue(const Item& it, int id, const ItemRect& hi, const ItemRect& vi);
void GetItemAttrs(const Item& it, int r, int c, const ItemRect& vi, const ItemRect& hi, dword& style, GridDisplay*& gd, Color& fg, Color& bg, Font& fnt);
void GetItemAttrs(const Item& it, const Value& val, int r, int c, const ItemRect& vi, const ItemRect& hi, dword& style, GridDisplay*& gd, Color& fg, Color& bg, Font& fnt);
Item& GetItemSize(int &r, int &c, int &x, int &y, int &cx, int &cy, bool &skip, bool relx = true, bool rely = true);
Image HorzPosImage();

1
uppsrc/GridCtrl/GridDisplay.cpp
View file

@ -79,6 +79,7 @@ void GridDisplay::Paint(Draw &w, int x, int y, int cx, int cy, const Value &val,
Size isz = leftImg.GetSize();
w.DrawImage(nx, ny + (cy - isz.cy) / 2, style & GD::READONLY ? Grayscale(leftImg) : leftImg);
nx += isz.cx + 3;
ncx -= isz.cx + 3;
}
if(!rightImg.IsEmpty())
{