Merge lp:~ricotz/plank/non-zoom-expand into lp:plank

[Rico Tzschichholz]

[lp:~ricotz/plank/non-zoom-expand]

1481. By Rico Tzschichholz on 2016-01-09

positionmanager: Expand dock on external-drag without enabled zoom too

Also try harder to insert dropped elements at the actually desired spot.

=== modified file 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2016-01-06 10:56:24 +0000
+++ lib/DockRenderer.vala	2016-01-09 09:20:52 +0000
@@ -1055,7 +1055,7 @@
 			
 			local_cursor = new_cursor;
 			
-			if (controller.prefs.ZoomEnabled) {
+			if (screen_is_composited) {
 				zoom_changed = true;
 				animated_draw ();
 			}
 
=== modified file 'lib/DragManager.vala'
--- lib/DragManager.vala	2015-12-09 13:07:04 +0000
+++ lib/DragManager.vala	2016-01-09 09:20:52 +0000
@@ -464,7 +464,7 @@
 					position_manager.get_hover_position (hovered_item, out hx, out hy);
 					hover.set_text (hovered_item.get_drop_text ());
 					hover.show_at (hx, hy, position_manager.Position);
-				} else if (hide_manager.Hovered) {
+				} else if (hide_manager.Hovered && !controller.prefs.LockItems) {
 					int hx = x, hy = y;
 					position_manager.get_hover_position_at (ref hx, ref hy);
 					hover.set_text (_("Drop to add to dock"));
 
=== modified file 'lib/Items/DockItemProvider.vala'
--- lib/Items/DockItemProvider.vala	2015-11-03 10:37:19 +0000
+++ lib/Items/DockItemProvider.vala	2016-01-09 09:20:52 +0000
@@ -85,19 +85,15 @@
 		{
 			bool result = false;
 			
-			unowned DockItem? hovered_item = null;
+			unowned DockItem? target_item = null;
 			unowned DockController? controller = get_dock ();
 			if (controller != null && controller.window.HoveredItemProvider == this) {
-				hovered_item = controller.window.HoveredItem;
-				if (hovered_item == null) {
-					var cursor = controller.renderer.local_cursor;
-					hovered_item = controller.position_manager.get_nearest_item_at (cursor.x, cursor.y, this);
-				}
+				target_item = controller.position_manager.get_current_target_item (this);
 			}
 			
 			foreach (var uri in uris) {
 				if (!item_exists_for_uri (uri)) {
-					add_item_with_uri (uri, hovered_item);
+					add_item_with_uri (uri, target_item);
 					result = true;
 				}
 			}
 
=== modified file 'lib/PositionManager.vala'
--- lib/PositionManager.vala	2015-12-09 09:30:43 +0000
+++ lib/PositionManager.vala	2016-01-09 09:20:52 +0000
@@ -812,11 +812,10 @@
 			DrawValuesFunc? post_func = null)
 		{
 			unowned DockPreferences prefs = controller.prefs;
+			unowned DockRenderer renderer = controller.renderer;
 			
 			draw_values.clear ();
 			
-			bool external_drag_active = controller.drag_manager.ExternalDragActive;
-			
 			// first we do the math as if this is a top dock, to do this we need to set
 			// up some "pretend" variables. we pretend we are a top dock because 0,0 is
 			// at the top.
@@ -824,8 +823,7 @@
 			int height = DockHeight;
 			int icon_size = IconSize;
 			
-			double zoom_in_progress = controller.renderer.zoom_in_progress;
-			Gdk.Point cursor = controller.renderer.local_cursor;
+			Gdk.Point cursor = renderer.local_cursor;
 			
 			// "relocate" our cursor to be on the top
 			switch (Position) {
@@ -888,8 +886,11 @@
 			// zoom_in_percent is a range of 1 to ZoomPercent.
 			// We need a number that is 1 when ZoomIn is 0, and ZoomPercent when ZoomIn is 1.
 			// Then we treat this as if it were the ZoomPercent for the rest of the calculation.
-			double zoom_in_percent = (prefs.ZoomEnabled ? 1.0 + (ZoomPercent - 1.0) * zoom_in_progress : 1.0);
-			double zoom_icon_size = (prefs.ZoomEnabled ? ZoomIconSize : 2.0 * icon_size);
+			bool expand_for_drop = (controller.drag_manager.ExternalDragActive && !prefs.LockItems);
+			bool zoom_enabled = prefs.ZoomEnabled;
+			double zoom_in_progress = (zoom_enabled || expand_for_drop ? renderer.zoom_in_progress : 0.0);
+			double zoom_in_percent = (zoom_enabled ? 1.0 + (ZoomPercent - 1.0) * zoom_in_progress : 1.0);
+			double zoom_icon_size = ZoomIconSize;
 			
 			foreach (unowned DockItem item in items) {
 				DockItemDrawValue val = new DockItemDrawValue ();
@@ -909,10 +910,10 @@
 				double offset = double.min (Math.fabs (cursor_position - center_position), zoom_icon_size);
 				
 				double offset_percent;
-				if (external_drag_active) {
+				if (expand_for_drop) {
 					// Provide space for dropping between items
 					offset += offset * zoom_icon_size / icon_size;
-					offset_percent = double.min (1.0, offset / (zoom_icon_size + ZoomIconSize));
+					offset_percent = double.min (1.0, offset / (2.0 * zoom_icon_size));
 				} else {
 					offset_percent = offset / zoom_icon_size;
 				}
@@ -930,11 +931,7 @@
 				//         value. The center is 100%. (1 - offset_percent) == 0,1 distance from center
 				// The .66 value comes from the area under the curve.  Dont ask me to explain it too much because it's too clever for me.
 				
-				// for external drags with no zoom, we pretend there is actually a zoom of 200%
-				if (external_drag_active && ZoomPercent == 1.0)
-					offset *= zoom_in_progress / 2.0;
-				else
-					offset *= zoom_in_percent - 1.0;
+				offset *= zoom_in_progress / 2.0;
 				offset *= 1.0 - offset_percent / 3.0;
 				
 				if (cursor_position > center_position)
@@ -1206,6 +1203,23 @@
 		}
 		
 		/**
+		 * Get the item which is the appropriate target for a drag'n'drop action.
+		 * The returned item may not hovered and is meant to be used as target
+		 * for e.g. DockContainer.add/move_to functions.
+		 * If a container is given the result will be restricted to its children.
+		 *
+		 * @param container a container or NULL 
+		 */
+		public unowned DockItem? get_current_target_item (DockContainer? container = null)
+		{
+			unowned DockRenderer renderer = controller.renderer;
+			var cursor = renderer.local_cursor;
+			var offset = (int) ((renderer.zoom_in_progress * ZoomIconSize + ItemPadding) / 2.0);
+			
+			return get_nearest_item_at (cursor.x + offset, cursor.y + offset, container);
+		}
+		
+		/**
 		 * Get's the x and y position to display a menu for a dock item.
 		 *
 		 * @param hovered the item that is hovered
 
=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2015-12-09 09:30:43 +0000
+++ lib/libplank.symbols	2016-01-09 09:20:52 +0000
@@ -521,6 +521,7 @@
 plank_position_manager_get_background_region
 plank_position_manager_get_barrier
 plank_position_manager_get_BottomPadding
+plank_position_manager_get_current_target_item
 plank_position_manager_get_cursor_region
 plank_position_manager_get_dock_draw_position
 plank_position_manager_get_dock_window_region