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

GridCtrl fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11347 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-10-04 17:13:34 +00:00
parent 0892999484
commit 3556771cf6
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -6472,9 +6472,14 @@ Ctrl * GridCtrl::GetCtrl(int r, int c, bool check_visibility, bool hrel, bool vr
return ctrl;
}
Ctrl * GridCtrl::GetCtrl(int r, int c, bool check_visibility)
Ctrl * GridCtrl::GetCtrl(int r, int c)
{
return GetCtrl(r + fixed_rows, c, check_visibility, true, false);
return GetCtrl(r + fixed_rows, c, true, true, false);
}
Ctrl * GridCtrl::GetCtrlAt(int r, int c)
{
return GetCtrl(r + fixed_rows, c, false, true, false);
}
Ctrl * GridCtrl::GetCtrl(int c)

7
uppsrc/GridCtrl/GridCtrl.h
View file

@ -1590,8 +1590,9 @@ class GridCtrl : public Ctrl
void Serialize(Stream &s);
Ctrl * GetCtrl(int r, int c, bool check_visibility = true);
Ctrl * GetCtrl(int c);
Ctrl * GetCtrl(int r, int c); // checks visibility - if widget is out of view, returns NULL
Ctrl * GetCtrlAt(int r, int c); // does not check visibility
Ctrl * GetCtrl(int c); // checks visibility - if widget is out of view, returns NULL
static int GetStdHeight() { return Draw::GetStdFontCy() + 4; }
@ -1763,7 +1764,7 @@ class GridCtrl : public Ctrl
void Nothing();
void Init();
Ctrl * GetCtrl(int x, int y, bool check_visibility, bool hrel, bool vrel = false, bool check_edits = true);
Ctrl * GetCtrl(int x, int y, bool check_visibility, bool hrel = false, bool vrel = false, bool check_edits = true);
Ctrl * GetCtrl(const Point &p, bool check_visibility, bool hrel = false, bool vrel = false, bool check_edits = true);
bool IsCtrl(Point &p, bool check_visibility = true);