Browse Source

Merge pull request #36 from Kezeali/dragdrop_fix

Fixed drag & drop
Lloyd Weehuizen 14 years ago
parent
commit
7a7fa6dcf5
2 changed files with 3 additions and 1 deletions
  1. 1 1
      Samples/basic/drag/src/DragListener.cpp
  2. 2 0
      Source/Core/Context.cpp

+ 1 - 1
Samples/basic/drag/src/DragListener.cpp

@@ -42,7 +42,7 @@ void DragListener::ProcessEvent(Rocket::Core::Event& event)
 	{
 		Rocket::Core::Element* dest_container = event.GetCurrentElement();
 		Rocket::Core::Element* dest_element = event.GetTargetElement();
-		Rocket::Core::Element* drag_element = static_cast< Rocket::Core::Element* >(event.GetParameter< void* >("drag_element", NULL));
+		Rocket::Core::Element* drag_element = *static_cast< Rocket::Core::Element** >(event.GetParameter< void* >("drag_element", NULL));
 
 		if (dest_container == dest_element)
 		{

+ 2 - 0
Source/Core/Context.cpp

@@ -59,6 +59,8 @@ Context::Context(const String& name) : name(name), mouse_position(0, 0), dimensi
 		if (element != NULL)
 			element->RemoveReference();
 	}
+	else
+		cursor_proxy->context = this;
 
 	document_focus_history.push_back(root);
 	focus = root;