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

Some SystemDraw fixes, fixed another reason for key lag in theide

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1160 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-05-12 07:43:36 +00:00
commit 53bda7f512
11 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CtrlCore/Win32DnD.cpp
View file

@ -108,6 +108,7 @@ String UDropTarget::Get(const char *fmt) const
void UDropTarget::DnD(POINTL pl, bool drop, DWORD *effect, DWORD keys)
{
LLOG("DnD effect: " << *effect);
dword e = *effect;
*effect = DROPEFFECT_NONE;
if(!ctrl)
@ -119,20 +120,24 @@ void UDropTarget::DnD(POINTL pl, bool drop, DWORD *effect, DWORD keys)
d.allowed = 0;
d.action = 0;
if(e & DROPEFFECT_COPY) {
LLOG("DnD DROPEFFECT_COPY");
d.allowed = DND_COPY;
d.action = DND_COPY;
}
if(e & DROPEFFECT_MOVE) {
LLOG("DnD DROPEFFECT_MOVE");
d.allowed |= DND_MOVE;
if(Ctrl::GetDragAndDropSource())
d.action = DND_MOVE;
}
LLOG("DnD keys & MK_CONTROL:" << (keys & MK_CONTROL));
if((keys & MK_CONTROL) && (d.allowed & DND_COPY))
d.action = DND_COPY;
if((keys & (MK_ALT|MK_SHIFT)) && (d.allowed & DND_MOVE))
d.action = DND_MOVE;
ctrl->DnD(Point(pl.x, pl.y), d);
if(d.IsAccepted()) {
LLOG("DnD accepted, action: " << (int)d.action);
if(d.action == DND_MOVE)
*effect = DROPEFFECT_MOVE;
if(d.action == DND_COPY)
@ -446,12 +451,15 @@ STDMETHODIMP UDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeySta
STDMETHODIMP UDropSource::GiveFeedback(DWORD dwEffect)
{
LLOG("GiveFeedback");
Image m = IsNull(move) ? copy : move;
if((dwEffect & DROPEFFECT_COPY) == DROPEFFECT_COPY) {
LLOG("GiveFeedback COPY");
if(!IsNull(copy)) m = copy;
}
else
if((dwEffect & DROPEFFECT_MOVE) == DROPEFFECT_MOVE) {
LLOG("GiveFeedback MOVE");
if(!IsNull(move)) m = move;
}
else