Update to r13516 to also deal with horizontal movement. Toolbars should now dock where you undocked them from, if you don't move them.

Thanks to Gale for a very clear description of the issue, which I hadn't seen because of how I click/drag.

src/toolbars/ToolManager.cpp

@@ -1029,7 +1029,9 @@ void ToolManager::OnMouse( wxMouseEvent & event )
 
       // Add half the bar height.  We could use the actual bar height, but that would be confusing as a 
       // bar removed at a place might not dock back there if just let go.
-      pos +=  wxPoint( 0, 20 ); 
+      // Also add 5 pixels in horizontal direction, so that a click without a move (or a very small move) 
+      // lands back where we started.
+      pos +=  wxPoint( 5, 20 ); 
 
       // Is mouse pointer within either dock?
       ToolDock *dock = NULL;