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

.cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7192 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-04-08 17:36:26 +00:00
parent 7342ab8047
commit 20be2642a0
19 changed files with 53 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -747,11 +747,12 @@ void ArrayCtrl::ChildGotFocus()
RefreshRow(cursor);
if(!acceptingrow) {
Point p = FindCellCtrl(GetFocusCtrl());
if(!IsNull(p))
if(!IsNull(p)) {
if(nocursor)
ScrollInto(p.y);
else
SetCursor(p.y);
}
}
Ctrl::ChildGotFocus();
}
@ -834,7 +835,7 @@ Size ArrayCtrl::DoPaint(Draw& w, bool sample) {
Color fg, bg;
Value q;
const Display& d = GetCellInfo(i, jj, hasfocus0, q, fg, bg, st);
if(sample || w.IsPainting(r))
if(sample || w.IsPainting(r)) {
if(cw < 2 * cm || editmode && i == cursor && column[jj].edit)
d.PaintBackground(w, r, q, fg, bg, st);
else {
@ -846,6 +847,7 @@ Size ArrayCtrl::DoPaint(Draw& w, bool sample) {
GetDisplay(i, jj).Paint(w, r, q, fg, bg, st);
w.End();
}
}
x += cw;
if(vertgrid)
w.DrawRect(x - 1, r.top, 1, r.Height(), gridcolor);