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

*CtrlLib: Fixed issues with various popups (like tooltip) and deactivating the window

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2568 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-07-25 10:12:56 +00:00
commit 3a4c419412
6 changed files with 146 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

51
uppsrc/CtrlLib/LabelBase.cpp
View file

@ -470,31 +470,54 @@ DisplayPopup::DisplayPopup()
style = 0;
item = slim = Null;
margin = 0;
ONCELOCK {
InstallStateHook(StateHook);
}
LinkBefore(all);
}
DisplayPopup::~DisplayPopup()
{
Unlink();
}
void DisplayPopup::Sync()
{
Refresh();
if(display && ctrl && !ctrl->IsDragAndDropTarget() && !IsDragAndDropTarget()) {
Size sz = display->GetStdSize(value);
if(sz.cx + 2 * margin > item.GetWidth() || sz.cy > item.GetHeight()) {
Rect wa = GetWorkArea();
slim = item + ctrl->GetScreenView().TopLeft();
Rect r = item;
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());
SetRect(r);
if(!IsOpen())
Ctrl::PopUp(ctrl, true, false, false);
return;
Ctrl *top = ctrl->GetTopCtrl();
if(top && top->HasFocusDeep()) {
Size sz = display->GetStdSize(value);
Ctrl *top = ctrl->GetTopWindow();
if(sz.cx + 2 * margin > item.GetWidth() || sz.cy > item.GetHeight()) {
Rect wa = GetWorkArea();
slim = item + ctrl->GetScreenView().TopLeft();
Rect r = item;
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());
SetRect(r);
if(!IsOpen())
Ctrl::PopUp(ctrl, true, false, false);
Refresh();
return;
}
}
}
if(IsOpen())
Close();
}
Link<DisplayPopup> DisplayPopup::all[1];
bool DisplayPopup::StateHook(Ctrl *, int reason)
{
if(reason == FOCUS)
for(DisplayPopup *p = all->Link<DisplayPopup>::GetNext(); p != all; p = p->Link<DisplayPopup>::GetNext())
p->Sync();
return false;
}
void DisplayPopup::Cancel()
{
display = NULL;