Merge pull request livecode#3054 from runrevmark/widget-bypass_dnd

runrevmark · runrevmark · commit d30d1942e0ca · 2015-10-14T11:36:17.000+01:00
[[ Widgets ]] Bypass widgets for drag-drop related messages.
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -589,9 +589,14 @@ Boolean MCCard::mfocus(int2 x, int2 y)
 					mfocused = tptr;
 
                 // The widget event manager handles enter/leave itself
-				if (newfocused && mfocused != NULL
-                    && mfocused -> getref() -> gettype() != CT_GROUP
-                    && mfocused -> getref() -> gettype() != CT_WIDGET)
+				if (newfocused && mfocused != NULL &&
+                    mfocused -> getref() -> gettype() != CT_GROUP &&
+#ifdef WIDGETS_HANDLE_DND
+                    mfocused -> getref() -> gettype() != CT_WIDGET)
+#else
+                    (MCdispatcher -> isdragtarget() ||
+                    mfocused -> getref() -> gettype() != CT_WIDGET))
+#endif
 				{
 					mfocused->getref()->enter();
 					
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -2219,9 +2219,12 @@ void MCDispatch::dodrop(bool p_source)
 	{
 		// We are only the source
 		m_drag_end_sent = true;
+        
+#ifdef WIDGETS_HANDLE_DND
         if (MCdragsource->gettype() == CT_WIDGET)
             MCwidgeteventmanager->event_dnd_end(reinterpret_cast<MCWidget*>(MCdragsource));
         else
+#endif
             MCdragsource -> message(MCM_drag_end);
 
 		// OK-2008-10-21 : [[Bug 7316]] - Cursor in script editor follows mouse after dragging to non-LiveCode target.
@@ -2342,12 +2345,14 @@ void MCDispatch::dodrop(bool p_source)
     t_auto_drop = MCdragdest != NULL;
     if (t_auto_drop)
     {
+#ifdef WIDGETS_HANDLE_DND
         if (MCdragdest->gettype() == CT_WIDGET)
         {
             MCwidgeteventmanager->event_dnd_drop(reinterpret_cast<MCWidget*>(MCdragdest));
             t_auto_drop = false;
         }
         else
+#endif
         {
             t_auto_drop = MCdragdest -> message(MCM_drag_drop) != ES_NORMAL;
         }
@@ -2392,12 +2397,14 @@ void MCDispatch::dodrop(bool p_source)
 	if (MCdragsource != NULL)
 	{
 		m_drag_end_sent = true;
+#ifdef WIDGETS_HANDLE_DND
         if (MCdragsource->gettype() == CT_WIDGET)
         {
             MCwidgeteventmanager->event_dnd_end(reinterpret_cast<MCWidget*>(MCdragsource));
             t_auto_end = false;
         }
         else
+#endif
         {
             t_auto_end = MCdragsource -> message(MCM_drag_end) != ES_NORMAL;
         }
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -276,7 +276,12 @@ Boolean MCWidget::mfocus(int2 p_x, int2 p_y)
 		(getflag(F_DISABLED) && (getstack() -> gettool(this) == T_BROWSE)))
 		return False;
 	
-	if (getstack() -> gettool(this) != T_BROWSE)
+	if (getstack() -> gettool(this) != T_BROWSE ||
+#ifdef WIDGETS_HANDLE_DND
+        false)
+#else
+        MCdispatcher -> isdragtarget())
+#endif
 		return MCControl::mfocus(p_x, p_y);
 	
 	// Update the mouse loc.
@@ -291,7 +296,12 @@ Boolean MCWidget::mfocus(int2 p_x, int2 p_y)
 
 void MCWidget::munfocus(void)
 {
-	if (getstack() -> gettool(this) != T_BROWSE)
+	if (getstack() -> gettool(this) != T_BROWSE ||
+#ifdef WIDGETS_HANDLE_DND
+        false)
+#else
+        MCdispatcher -> isdragtarget())
+#endif
 	{
 		MCControl::munfocus();
 		return;

Original file line number	Diff line number	Diff line change
`@@ -2219,9 +2219,12 @@ void MCDispatch::dodrop(bool p_source)`
`2219`	`2219`	`{`
`2220`	`2220`	`// We are only the source`
`2221`	`2221`	`m_drag_end_sent = true;`
	`2222`	`+`
	`2223`	`+#ifdef WIDGETS_HANDLE_DND`
`2222`	`2224`	`if (MCdragsource->gettype() == CT_WIDGET)`
`2223`	`2225`	`MCwidgeteventmanager->event_dnd_end(reinterpret_cast<MCWidget*>(MCdragsource));`
`2224`	`2226`	`else`
	`2227`	`+#endif`
`2225`	`2228`	`MCdragsource -> message(MCM_drag_end);`
`2226`	`2229`
`2227`	`2230`	`// OK-2008-10-21 : [[Bug 7316]] - Cursor in script editor follows mouse after dragging to non-LiveCode target.`
`@@ -2342,12 +2345,14 @@ void MCDispatch::dodrop(bool p_source)`
`2342`	`2345`	`t_auto_drop = MCdragdest != NULL;`
`2343`	`2346`	`if (t_auto_drop)`
`2344`	`2347`	`{`
	`2348`	`+#ifdef WIDGETS_HANDLE_DND`
`2345`	`2349`	`if (MCdragdest->gettype() == CT_WIDGET)`
`2346`	`2350`	`{`
`2347`	`2351`	`MCwidgeteventmanager->event_dnd_drop(reinterpret_cast<MCWidget*>(MCdragdest));`
`2348`	`2352`	`t_auto_drop = false;`
`2349`	`2353`	`}`
`2350`	`2354`	`else`
	`2355`	`+#endif`
`2351`	`2356`	`{`
`2352`	`2357`	`t_auto_drop = MCdragdest -> message(MCM_drag_drop) != ES_NORMAL;`
`2353`	`2358`	`}`
`@@ -2392,12 +2397,14 @@ void MCDispatch::dodrop(bool p_source)`
`2392`	`2397`	`if (MCdragsource != NULL)`
`2393`	`2398`	`{`
`2394`	`2399`	`m_drag_end_sent = true;`
	`2400`	`+#ifdef WIDGETS_HANDLE_DND`
`2395`	`2401`	`if (MCdragsource->gettype() == CT_WIDGET)`
`2396`	`2402`	`{`
`2397`	`2403`	`MCwidgeteventmanager->event_dnd_end(reinterpret_cast<MCWidget*>(MCdragsource));`
`2398`	`2404`	`t_auto_end = false;`
`2399`	`2405`	`}`
`2400`	`2406`	`else`
	`2407`	`+#endif`
`2401`	`2408`	`{`
`2402`	`2409`	`t_auto_end = MCdragsource -> message(MCM_drag_end) != ES_NORMAL;`
`2403`	`2410`	`}`