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

GridCtrl: Fixed empty popup if cell contains AttrText value

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6133 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2013-06-05 07:12:19 +00:00
parent ce92a07486
commit 95a377444b
2 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -997,7 +997,17 @@ Value GridCtrl::GetItemValue(const Item& it, int id, const ItemRect& hi, const I
? GetConvertedColumn(id, it.val)
: it.val;
return val;
return val;
}
Value GridCtrl::GetAttrTextVal(const Value& val)
{
if(IsType<AttrText>(val))
{
const AttrText& t = ValueTo<AttrText>(val);
return t.text;
}
return val;
}
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)
@ -1508,11 +1518,7 @@ void GridCtrl::Paint(Draw &w)
gd->row = i - fixed_cols;
gd->parent = this;
if(IsType<AttrText>(val))
{
const AttrText& t = ValueTo<AttrText>(val);
val = t.text;
}
val = GetAttrTextVal(val);
gd->Paint(w, x, y, cx, cy,
val, style,
@ -1618,9 +1624,19 @@ void GridCtrl::DrawVertDragLine(Draw &w, int pos, int size, int dx, Color c)
w.DrawRect(1 + dx, pos, size - dx - 1, 2, c);
}
Value GridCtrl::GetStdConvertedValue(const Value& v)
Value GridCtrl::GetStdConvertedValue(const Value& v) const
{
return IsString(v) ? v : StdConvert().Format(v);
if(IsString(v))
{
return v;
}
else if(IsType<AttrText>(v))
{
const AttrText& t = ValueTo<AttrText>(v);
return t.text;
}
else
return StdConvert().Format(v);
}
Value GridCtrl::GetConvertedColumn(int col, const Value &v) const
@ -1632,17 +1648,7 @@ Value GridCtrl::GetConvertedColumn(int col, const Value &v) const
Value GridCtrl::GetStdConvertedColumn(int col, const Value &v) const
{
Value val = GetConvertedColumn(col, v);
if(IsString(val))
{
return val;
}
else if(IsType<AttrText>(val))
{
const AttrText& t = ValueTo<AttrText>(val);
return t.text;
}
else
return StdConvert().Format(val);//GetStdConvertedValue(val);
return GetStdConvertedValue(val);
}
String GridCtrl::GetString(Id id) const

3
uppsrc/GridCtrl/GridCtrl.h
View file

@ -1598,7 +1598,7 @@ class GridCtrl : public Ctrl
ScrollBar& HorzScroll() { return sbx; }
ScrollBar& VertScroll() { return sby; }
Value GetStdConvertedValue(const Value& v);
Value GetStdConvertedValue(const Value& v) const;
Value GetConvertedColumn(int col, const Value& v) const;
Value GetStdConvertedColumn(int col, const Value& v) const;
String GetString(Id id) const;
@ -1764,6 +1764,7 @@ class GridCtrl : public Ctrl
Value GetItemValue(const Item& it, int id, const ItemRect& hi, const ItemRect& vi);
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);
Value GetAttrTextVal(const Value& val);
Image HorzPosImage();
Image VertPosImage();