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

Large DisplayPopup issues behaviour improved

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8894 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-09-06 05:27:11 +00:00
parent dec9c910ec
commit 22b924c8fe
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/CtrlLib/LabelBase.cpp
View file

@ -548,7 +548,8 @@ void DisplayPopup::Sync()
r.right = max(r.right, r.left + sz.cx + 2 * margin);
r.bottom = max(r.bottom, r.top + sz.cy);
r.Inflate(1, 1);
r.Offset(ctrl->GetScreenView().TopLeft());
Rect v = ctrl->GetScreenView();
r.Offset(v.TopLeft());
Rect wa = GetWorkArea(r.BottomLeft());
Size sz = r.GetSize();
@ -567,8 +568,12 @@ void DisplayPopup::Sync()
}
else
if(r.bottom > wa.bottom) {
r.top = max(wa.top, wa.bottom - sz.cy);
r.bottom = wa.bottom;
if(wa.bottom - r.top < r.top - wa.top) { // there is more space upside
r.bottom = item.bottom + v.top;
r.top = max(wa.top, r.bottom - sz.cy);
}
else
r.bottom = wa.bottom;
}
SetRect(r);