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

GridCtrl: remove depricated usage of VeiwDraw.

Browse source
This commit is contained in:
Zbigniew Rębacz 2026-01-28 22:03:28 +01:00
parent 3dc229041e
commit e8c85a9970
2 changed files with 5 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

54
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -972,38 +972,9 @@ void GridCtrl::Nothing()
{ {
} }
void GridCtrl::DrawLine(bool iniLine, bool delLine)
{
if((resizeCol || resizeRow) && resize_paint_mode < 2)
{
int sx = resize_paint_mode == 1 ? fixed_width : 0;
int sy = resize_paint_mode == 1 ? fixed_height : 0;
ViewDraw w(this);
Size sz = GetSize();
Point curPnt;
static Point oldPnt = curPnt;
if(resizeCol)
{
curPnt.x = hitems[splitCol].nRight(sbx) - 1;
if(delLine) w.DrawRect(oldPnt.x, sy, 1, sz.cy, InvertColor());
if(iniLine) w.DrawRect(curPnt.x, sy, 1, sz.cy, InvertColor());
}
if(resizeRow)
{
curPnt.y = vitems[splitRow].nBottom(sby) - 1;
if(delLine) w.DrawRect(sx, oldPnt.y, sz.cx, 1, InvertColor());
if(iniLine) w.DrawRect(sx, curPnt.y, sz.cx, 1, InvertColor());
}
oldPnt = curPnt;
}
}
Value GridCtrl::GetItemValue(const Item& it, int id, const ItemRect& hi, const ItemRect& vi) Value GridCtrl::GetItemValue(const Item& it, int id, const ItemRect& hi, const ItemRect& vi)
{ {
Value val = hi.IsConvertion() && vi.IsConvertion() Value val = hi.IsConvertion() && vi.IsConvertion()
? GetConvertedColumn(id, it.val) ? GetConvertedColumn(id, it.val)
: it.val; : it.val;
@ -4164,24 +4135,8 @@ Point GridCtrl::GetCtrlPos(Ctrl * ctrl)
return Point(-1, -1); return Point(-1, -1);
} }
void GridCtrl::Split(int state, bool sync) void GridCtrl::Split(GridState state)
{ {
if(resize_paint_mode < 2)
{
if(resize_paint_mode > 0 && state != GS_DOWN)
{
if(resizeCol) RefreshTop();
if(resizeRow) RefreshLeft();
}
if(state == GS_DOWN)
DrawLine(true, false);
else if(state == GS_MOVE)
DrawLine(true, true);
else
DrawLine(false, true);
}
if(state == GS_DOWN) if(state == GS_DOWN)
{ {
firstCol = firstRow = -1; firstCol = firstRow = -1;
@ -4193,7 +4148,6 @@ void GridCtrl::Split(int state, bool sync)
UpdateSizes(); UpdateSizes();
UpdateHolder(); UpdateHolder();
UpdateSb(); UpdateSb();
Refresh();
} }
if((resize_paint_mode > 1 && state > GS_UP) || state == GS_UP) if((resize_paint_mode > 1 && state > GS_UP) || state == GS_UP)
@ -4202,8 +4156,8 @@ void GridCtrl::Split(int state, bool sync)
UpdateCtrls(UC_CHECK_VIS | UC_SHOW); UpdateCtrls(UC_CHECK_VIS | UC_SHOW);
} }
if(sync) Refresh();
Sync(); Sync();
} }
bool GridCtrl::TabKey(bool enter_mode) bool GridCtrl::TabKey(bool enter_mode)

5
uppsrc/GridCtrl/GridCtrl.h
View file

@ -1003,7 +1003,6 @@ class GridCtrl : public Ctrl
bool valid_cursor; bool valid_cursor;
/* Values */ /* Values */
int curSplitCol, curSplitRow; int curSplitCol, curSplitRow;
@ -1718,7 +1717,7 @@ class GridCtrl : public Ctrl
int GetFocusedCtrlIndex(); int GetFocusedCtrlIndex();
Point GetCtrlPos(Ctrl * ctrl); Point GetCtrlPos(Ctrl * ctrl);
void Split(int state = 0, bool sync = false); void Split(GridState gstate);
void Scroll(); void Scroll();
bool IsTopHeader() { return fixed_rows > 0; } bool IsTopHeader() { return fixed_rows > 0; }
@ -1726,8 +1725,6 @@ class GridCtrl : public Ctrl
bool IsMouseBody(Point &p); bool IsMouseBody(Point &p);
void DrawLine(bool iniLine, bool delLine);
Rect GetItemRect(int r, int c, bool hgrid = false, bool vgrid = false, bool hrel = false, bool vrel = false); Rect GetItemRect(int r, int c, bool hgrid = false, bool vgrid = false, bool hrel = false, bool vrel = false);
bool Match(const WString &f, const WString &s, int &fs, int &fe); bool Match(const WString &f, const WString &s, int &fs, int &fe);