瀏覽代碼

Fix cloning and mouse drag-drop

Michael Ragazzon 6 年之前
父節點
當前提交
0a97291f67
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      Source/Core/Context.cpp
  2. 4 4
      Source/Core/EventSpecification.cpp

+ 1 - 1
Source/Core/Context.cpp

@@ -200,7 +200,7 @@ bool Context::Render()
 	// Render the cursor proxy so any elements attached the cursor will be rendered below the cursor.
 	if (cursor_proxy != NULL)
 	{
-		cursor_proxy->Update(density_independent_pixel_ratio);
+		cursor_proxy->UpdateDocument();
 		cursor_proxy->SetOffset(Vector2f((float)Math::Clamp(mouse_position.x, 0, dimensions.x),
 			(float)Math::Clamp(mouse_position.y, 0, dimensions.y)),
 			NULL);

+ 4 - 4
Source/Core/EventSpecification.cpp

@@ -65,12 +65,12 @@ void Initialize()
 		{EventId::Show          , "show"          , false , false , DefaultActionPhase::None},
 		{EventId::Hide          , "hide"          , false , false , DefaultActionPhase::None},
 		{EventId::Mousemove     , "mousemove"     , true  , true  , DefaultActionPhase::None},
-		{EventId::Dragmove      , "dragmove"      , true  , true  , DefaultActionPhase::Target},
+		{EventId::Dragmove      , "dragmove"      , true  , true  , DefaultActionPhase::None},
 		{EventId::Drag          , "drag"          , false , true  , DefaultActionPhase::Target},
 		{EventId::Dragstart     , "dragstart"     , false , true  , DefaultActionPhase::Target},
-		{EventId::Dragover      , "dragover"      , true  , false , DefaultActionPhase::Target},
-		{EventId::Dragdrop      , "dragdrop"      , true  , false , DefaultActionPhase::Target},
-		{EventId::Dragout       , "dragout"       , true  , false , DefaultActionPhase::Target},
+		{EventId::Dragover      , "dragover"      , true  , true  , DefaultActionPhase::None},
+		{EventId::Dragdrop      , "dragdrop"      , true  , true  , DefaultActionPhase::None},
+		{EventId::Dragout       , "dragout"       , true  , true  , DefaultActionPhase::None},
 		{EventId::Dragend       , "dragend"       , true  , true  , DefaultActionPhase::None},
 		{EventId::Handledrag    , "handledrag"    , false , true  , DefaultActionPhase::None},
 		{EventId::Resize        , "resize"        , false , false , DefaultActionPhase::None},