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

.developing rainbow

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3704 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-07-22 20:29:07 +00:00
parent c2d33b7f47
commit d3d4804c34
3 changed files with 6 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rainbow/Framebuffer/DnD.cpp
View file

@ -4,7 +4,7 @@
NAMESPACE_UPP
#define LLOG(x) DLOG(x)
#define LLOG(x) // DLOG(x)
// --------------------------------------------------------------------------------------------
@ -38,7 +38,6 @@ Ptr<DnDLoop> dndloop;
bool PasteClip::IsAvailable(const char *fmt) const
{
DDUMP(fmt);
GuiLock __;
return dnd ? dndloop && FindIndex(dndloop->fmts, fmt) >= 0
: IsClipboardAvailable(fmt);
@ -76,7 +75,7 @@ void DnDLoop::DnD(bool paste)
d.action = GetCtrl() ? DND_COPY : DND_MOVE;
d.dnd = true;
if(target)
target->DnD(GetMousePos() - target->GetScreenRect().TopLeft(), d);
target->DnD(GetMousePos(), d);
action = d.IsAccepted() ? d.GetAction() : DND_NONE;
}
@ -97,30 +96,6 @@ void DnDLoop::LeftUp(Point, dword)
GuiLock __;
LLOG("DnDLoop::LeftUp");
DnD(true);
/* if(target) {
LLOG("Sending XdndDrop to " << target);
XEvent e = ClientMsg(target, XdndDrop);
e.xclient.data.l[0] = src;
e.xclient.data.l[1] = 0;
e.xclient.data.l[2] = Xeventtime;
Xdnd_waiting_finished = true;
XSendEvent(Xdisplay, target, XFalse, 0, &e);
XFlush(Xdisplay);
int timeout = GetTickCount();
LLOG("Waiting for XdndFinished");
while(Xdnd_waiting_finished && GetTickCount() - timeout < 200) {
GuiSleep(0);
ProcessEvents();
}
LLOG("Waiting finished " << GetTickCount() - timeout << "ms");
if(Xdnd_waiting_status) {
LLOG("XdndFinished timeout");
Xdnd_status = DND_NONE;
Xdnd_waiting_finished = false;
}
else
LLOG("XdndFinished recieved");
}*/
EndLoop();
}
@ -150,7 +125,7 @@ int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions,
{
GuiLock __;
DnDLoop d;
d.actions = actions;
d.actions = (byte)actions;
d.reject = actions & DND_EXACTIMAGE ? CtrlCoreImg::DndNone() : MakeDragImage(CtrlCoreImg::DndNone(), sample);
if(actions & DND_COPY)
d.copy = actions & DND_EXACTIMAGE ? sample : MakeDragImage(CtrlCoreImg::DndCopy(), sample);

6
rainbow/Framebuffer/Wnd.cpp
View file

@ -4,9 +4,9 @@
NAMESPACE_UPP
#define LLOG(x) DLOG(x)
#define LDUMP(x) DDUMP(x)
#define LDUMPC(x) DDUMPC(x)
#define LLOG(x) //DLOG(x)
#define LDUMP(x) //DDUMP(x)
#define LDUMPC(x) //DDUMPC(x)
ImageBuffer Ctrl::framebuffer;
Vector<Rect> Ctrl::invalid;

1
rainbow/Paint/Draw.cpp
View file

@ -16,7 +16,6 @@ struct App : public Ctrl {
void Paint(Draw& w)
{
Size sz = GetSize();
DDUMP(sz);
w.DrawRect(0, 0, sz.cx, sz.cy, SWhite);
w.DrawRect(10, 10, 30, 30, SRed);
w.DrawLine(45, 45, 80, 120, 4, Blue);