github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-22 13:17:36 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Added multiline popups that use GridDisplay to paint the content, fixed several issues with fixed cells highlighting and popups

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1672 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2009-11-01 21:24:06 +00:00
commit c86b1c3a1a
2 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -1918,7 +1918,7 @@ void GridCtrl::SyncPopup()
Ctrl* ctrl = valid_pos ? GetCtrl(r, c, true, false, false) : NULL;
bool close = true;
bool close = popup.IsOpen();
if(valid_pos && !ctrl)
{
@ -1930,7 +1930,13 @@ void GridCtrl::SyncPopup()
Point p0 = GetMousePos();
int x = hitems[c].npos + p0.x - p.x - 1 - sbx.Get() * int(!fc);
int y = vitems[r].npos + p0.y - p.y - 1 - sby.Get() * int(!fr);
popup.PopUp(this, x, y, max(it.rcx + 10, hitems[c].nsize + 1), max(it.rcy + 10, vitems[r].nsize + 1));
popup.gd = it.display ? it.display : display;
Size scrsz = GetScreenSize();
int cx = min(600, min((int) (scrsz.cx * 0.4), max(it.rcx + 10, hitems[c].nsize + 1)));
int cy = max((fceil(it.rcx / (double) cx) + it.rcy) * Draw::GetStdFontCy() + 10, vitems[r].nsize + 1);
popup.PopUp(this, x, y, cx, cy);
UpdateHighlighting(GS_BORDER, Point(0, 0));
}
String text = r == 0 ? it.val : (Value)GetStdConvertedColumn(c, it.val);
@ -1950,6 +1956,7 @@ void GridCtrl::SyncPopup()
popup.Close();
oldSplitCol = -1;
oldSplitRow = -1;
UpdateHighlighting(GS_BORDER, Point(0, 0));
}
}
}
@ -5370,6 +5377,8 @@ void GridCtrl::MouseLeave()
if(live_cursor)
SetCursor0(-1, -1, CU_HIGHLIGHT);
UpdateHighlighting(GS_BORDER, Point(0, 0));
oldSplitCol = -1;
oldSplitRow = -1;
}
void GridCtrl::MouseWheel(Point p, int zdelta, dword keyflags)
@ -7585,11 +7594,14 @@ void GridPopUp::Paint(Draw &w)
{
Size sz = GetSize();
Color fg = SColorText;
Color bg = SColorPaper;
Font fnt(StdFont());
gd->Paint(w, 1, 1, sz.cx - 2, sz.cy - 2, text, GD::WRAP | GD::VCENTER, fg, bg, fnt);
DrawBorder(w, sz, BlackBorder);
// gd->Paint(Draw &w¸ int x¸ int y¸ int cx¸ int cy¸ const Value &val¸ dword style¸ Color &fg¸ Color &bg¸ Font &fnt¸ bool found = false¸ int fs = 0¸ int fe = 0)
w.DrawRect(1, 1, sz.cx - 2, sz.cy - 2, Color(240, 240, 240));
Size tsz = GetTextSize(text, StdFont());
w.DrawText((sz.cx - tsz.cx) / 2, (sz.cy - tsz.cy) / 2, text);
//w.DrawRect(1, 1, sz.cx - 2, sz.cy - 2, Color(240, 240, 240));
//Size tsz = GetTextSize(text, StdFont());
//w.DrawText((sz.cx - tsz.cx) / 2, (sz.cy - tsz.cy) / 2, text);
}
Point GridPopUp::Offset(Point p)
@ -7631,6 +7643,7 @@ void GridPopUp::MouseWheel(Point p, int zdelta, dword flags)
void GridPopUp::MouseLeave()
{
ctrl->MouseLeave();
Close();
}
void GridPopUp::MouseEnter(Point p, dword flags)