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 remaining issue with DisplayPopup and D&D

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12655 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-01-08 19:01:21 +00:00
parent adf580c9bd
commit 41b2aa9068
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/CtrlLib/DisplayPopup.cpp
View file

@ -14,6 +14,7 @@ void DisplayPopup::LeftDown(Point p, dword flags)
void DisplayPopup::LeftDrag(Point p, dword flags)
{
DLOG("LeftDrag");
ctrl->LeftDrag(Op(p), flags);
}
@ -53,6 +54,8 @@ void DisplayPopup::Paint(Draw& w)
{
Rect r = GetSize();
w.DrawRect(r, SColorPaper);
DDUMP(display);
DDUMP(value);
if(display) {
display->PaintBackground(w, r, value, ink, paper, style);
r.left += margin;
@ -172,6 +175,8 @@ bool DisplayPopup::MouseHook(Ctrl *, bool, int, Point, int, dword)
void DisplayPopup::Cancel()
{
if(GetDragAndDropSource())
return;
display = NULL;
Sync();
}
@ -190,7 +195,7 @@ void DisplayPopup::Set(Ctrl *_ctrl, const Rect& _item,
const Value& _value, const Display *_display,
Color _ink, Color _paper, dword _style, int _margin)
{
if(!GUI_ToolTips())
if(!GUI_ToolTips() || GetDragAndDropSource())
return;
if(item != _item || ctrl != _ctrl || value != _value || display != _display || ink != _ink ||
paper != _paper || style != _style) {