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

CtrlLib: Fixed ArrayCtrl Separator issue displaying TIP (#437)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5847 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-02-20 19:33:52 +00:00
parent b6dfdbf591
commit 3bc3e2cbfc
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -1886,6 +1886,9 @@ struct ArrayCtrlSeparatorDisplay : Display {
w.DrawRect(r.left, y, r.GetWidth(), 1, SColorShadow());
w.DrawRect(r.left, y + 1, r.GetWidth(), 1, SColorLight());
}
virtual Size GetStdSize(const Value& q) const {
return Size(0, 2);
}
};
void ArrayCtrl::AddSeparator()

3
uppsrc/CtrlLib/LabelBase.cpp
View file

@ -527,6 +527,9 @@ void DisplayPopup::Sync()
if(sz.cx + 2 * margin > item.GetWidth() || sz.cy > item.GetHeight()) {
slim = item + ctrl->GetScreenView().TopLeft();
if(slim.Contains(GetMousePos())) {
DDUMP(sz);
DDUMP(margin);
DDUMP(item);
Rect r = item;
r.right = max(r.right, r.left + sz.cx + 2 * margin);
r.bottom = max(r.bottom, r.top + sz.cy);