Merge lp:~ricotz/plank/clipping into lp:plank

[Rico Tzschichholz]

Use clipped drawing to avoid a refresh/redraw of the whole window.

[lp:~ricotz/plank/clipping]

1152. By Rico Tzschichholz on 2015-01-06

Move plank.gresource.xml to data

1153. By Rico Tzschichholz on 2015-01-06

prefswindow: Fix some sensitivity assignments

1154. By Rico Tzschichholz on 2015-01-13

abstractmain: Output information for more enabled features

1158. By Rico Tzschichholz on 2015-01-05

WIP: Some clean up

Unmerged revisions

1158. By Rico Tzschichholz on 2015-01-05

WIP: Some clean up

1157. By Rico Tzschichholz on 2014-11-28

WIP: Fix animation-corruptions

1156. By Rico Tzschichholz on 2014-11-27

WIP: Add clipped drawing support

1155. By Rico Tzschichholz on 2014-11-27

renderer: Be able to draw item-shadow only

=== modified file 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2015-01-05 10:54:40 +0000
+++ lib/DockRenderer.vala	2015-01-14 12:22:05 +0000
@@ -53,11 +53,14 @@
 		
 		int64 last_hide = 0;
 		int64 frame_time = 0;
+		int64 last_frame_time = 0;
+		
+		Gdk.Rectangle last_dock_extents;		
+		Cairo.Region cleanup_clip_region;
 		
 		bool screen_is_composited = false;
 		uint reset_position_manager_timer = 0;
 		int window_scale_factor = 1;
-		bool is_first_frame = true;
 		
 		ulong gtk_theme_name_changed_id = 0;
 		
@@ -150,6 +153,7 @@
 			reset_position_manager_timer = Gdk.threads_add_timeout (50, () => {
 				reset_position_manager_timer = 0;
 				controller.position_manager.update (theme);
+				animated_draw_full ();
 				
 				return false;
 			});
@@ -193,7 +197,7 @@
 			urgent_indicator_buffer = null;
 			urgent_glow_buffer = null;
 			
-			animated_draw ();
+			animated_draw_full ();
 		}
 		
 		/**
@@ -205,12 +209,14 @@
 			
 			controller.reset_buffers ();
 			
-			animated_draw ();
+			animated_draw_full ();
 		}
 		
 		void init_current_frame ()
 			requires (theme != null)
 		{
+			last_frame_time = frame_time;
+			
 			frame_time = GLib.get_monotonic_time ();
 			screen_is_composited = controller.position_manager.screen_is_composited;
 			
@@ -235,22 +241,34 @@
 		 *
 		 * @param cr the context to use for drawing
 		 */
-		public void draw_dock (Cairo.Context cr)
+		public override void draw_widget (Cairo.Context cr)
 		{
+			unowned PositionManager position_manager = controller.position_manager;
+			unowned DockItem dragged_item = controller.drag_manager.DragItem;
+			var full_redraw_needed = full_redraw;
+			
 #if HAVE_HIDPI
 			window_scale_factor = controller.window.get_window ().get_scale_factor ();
 #endif
 			// take the previous frame values into account to decide if we
 			// can bail a full draw to not miss a finishing animation-frame
-			var no_full_draw_needed = (!is_first_frame && hide_progress == 1.0 && opacity == 1.0);
+			var no_draw_needed = (!full_redraw_needed && hide_progress == 1.0 && opacity == 1.0);
+			var dock_redraw_needed = dock_redraw_needed (frame_time);
 			
 			init_current_frame ();
 			
-			unowned PositionManager position_manager = controller.position_manager;
-			unowned DockItem dragged_item = controller.drag_manager.DragItem;
 			var win_rect = position_manager.get_dock_window_region ();
 			var items = controller.Items;
 			
+			Cairo.Region clip_region = new Cairo.Region ();
+			
+			if (!dock_redraw_needed
+				&& cleanup_clip_region != null
+				&& !cleanup_clip_region.is_empty ())
+				clip_region.union (cleanup_clip_region);
+			
+			cleanup_clip_region = new Cairo.Region ();
+			
 			if (main_buffer == null) {
 				main_buffer = new DockSurface.with_surface (win_rect.width, win_rect.height, cr.get_target ());
 #if HAVE_HIDPI
@@ -268,7 +286,7 @@
 			// if the dock is completely hidden and not transparently drawn
 			// only draw ugent-glow indicators and bail since there is no need
 			// for further things
-			if (no_full_draw_needed && hide_progress == 1.0 && opacity == 1.0) {
+			if (no_draw_needed && hide_progress == 1.0 && opacity == 1.0) {
 				// we still need to clear out the previous output
 				cr.save ();
 				cr.set_source_rgba (0, 0, 0, 0);
@@ -299,16 +317,45 @@
 			benchmark.add ("background render time - %f ms".printf (end2.difference (start2) / 1000.0));
 #endif
 			
+			var draw_neighbours = (position_manager.ItemPadding < position_manager.IconShadowSize);
+			var draw_neighbours_shadow = (position_manager.ItemPadding / 2 < position_manager.IconShadowSize);
+			unowned DockItem? previous_item = null;
+			var draw_next_item = false;
 			
-			// draw each item onto the dock buffer
+			// draw needed items onto the main buffer
 			foreach (var item in items)
 			{
 #if BENCHMARK
 				start2 = new DateTime.now_local ();
 #endif
-				// Do not draw the currently dragged item
-				if (dragged_item != item)
-					draw_item (item);
+				if (full_redraw_needed || dock_redraw_needed) {
+					// Do not draw the currently dragged item
+					if (dragged_item != item)
+						draw_item (item);
+				} else if (item_redraw_needed (item, last_frame_time)
+					|| item_redraw_needed (item, frame_time)) {
+					if (previous_item != null && dragged_item != previous_item)
+						draw_item (previous_item, !draw_neighbours);
+					
+					// Do not draw the currently dragged item
+					if (dragged_item != item) {
+						var touched_region = draw_item (item);
+						clip_region.union_rectangle (touched_region);
+						if (item_in_transition (item, frame_time))
+							cleanup_clip_region.union_rectangle (touched_region);
+					} else {
+						clip_region.union_rectangle (position_manager.get_draw_value_for_item (item).hover_region);
+					}
+					
+					previous_item = null;
+					draw_next_item = draw_neighbours_shadow;
+				} else if (draw_next_item) {
+					if (dragged_item != item)
+						draw_item (item, !draw_neighbours);
+					draw_next_item = false;
+				} else if (draw_neighbours_shadow) {
+					previous_item = item;
+				}
 #if BENCHMARK
 				end2 = new DateTime.now_local ();
 				benchmark.add ("item render time - %f ms".printf (end2.difference (start2) / 1000.0));
@@ -317,8 +364,21 @@
 			
 			// calculate drawing offset
 			var x_offset = 0, y_offset = 0;
-			if (opacity == 1.0)
+			if (opacity == 1.0) {
 				position_manager.get_dock_draw_position (out x_offset, out y_offset);
+				clip_region.translate (x_offset, y_offset);
+			}
+			
+			// draw the whole previously/currently visible dock-area if needed
+			if (dock_redraw_needed && !full_redraw_needed) {
+				clip_region.union_rectangle (last_dock_extents);
+				last_dock_extents = position_manager.get_dock_extents ();
+				clip_region.union_rectangle (last_dock_extents);
+			}
+
+			// restrict drawing to the actual visible window-area
+			clip_region.intersect_rectangle ({ 0, 0, win_rect.width, win_rect.height });
+			var clipped_redraw = !clip_region.is_empty ();
 			
 			// composite dock layers and make sure to draw onto the window's context with one operation
 			unowned Cairo.Context composite_cr = shadow_buffer.Context;
@@ -331,15 +391,25 @@
 				composite_cr.set_operator (Cairo.Operator.SOURCE);
 				composite_cr.set_source_rgba (0, 0, 0, 0);
 				composite_cr.paint_with_alpha (1 - opacity);
+			} else if (!full_redraw_needed && clipped_redraw) {
+				for (int i = 0; i < clip_region.num_rectangles (); i++) {
+					var rect = clip_region.get_rectangle (i);
+					cr.rectangle (rect.x, rect.y, rect.width, rect.height);
+				}
+				cr.clip ();
 			}
 			
-			// draw the dock on the window
-			cr.set_operator (Cairo.Operator.SOURCE);
-			cr.set_source_surface (shadow_buffer.Internal, x_offset, y_offset);
-			cr.paint ();
+			if (full_redraw_needed || clipped_redraw) {
+				// draw the dock on the window
+				cr.set_operator (Cairo.Operator.SOURCE);
+				cr.set_source_surface (shadow_buffer.Internal, x_offset, y_offset);
+				cr.paint ();
+			}
 			
 			// draw urgent-glow if dock is completely hidden
 			if (hide_progress == 1.0) {
+				if (!full_redraw_needed && clipped_redraw)
+					cr.reset_clip ();
 				foreach (var item in items)
 					draw_urgent_glow (item, cr);
 			}
@@ -352,8 +422,6 @@
 					message ("	" + s);
 			message ("render time - %f ms", diff);
 #endif
-			
-			is_first_frame = false;
 		}
 		
 		void draw_dock_background ()
@@ -377,42 +445,18 @@
 			cr.paint ();
 		}
 		
-		void draw_item (DockItem item)
+		Gdk.Rectangle draw_item (DockItem item, bool shadow_only = false)
 		{
 			unowned PositionManager position_manager = controller.position_manager;
 			unowned DockItem hovered_item = controller.window.HoveredItem;
 			unowned DragManager drag_manager = controller.drag_manager;
 			
 			unowned Cairo.Context main_cr = main_buffer.Context;
-			unowned Cairo.Context shadow_cr = shadow_buffer.Context;
 			var icon_size = position_manager.IconSize;
 			var shadow_size = position_manager.IconShadowSize;
 			var position = position_manager.Position;
 			
-			// load the icon
-#if BENCHMARK
-			var start = new DateTime.now_local ();
-#endif
-			var icon_surface = item.get_surface_copy (icon_size * window_scale_factor, icon_size * window_scale_factor, main_buffer);
-			unowned Cairo.Context icon_cr = icon_surface.Context;
-			
-			DockSurface? icon_shadow_surface = null;
-			if (shadow_size > 0)
-				icon_shadow_surface = item.get_background_surface (draw_item_shadow);
-			
-			DockSurface? icon_overlay_surface = null;
-			if (item.CountVisible || item.ProgressVisible)
-				icon_overlay_surface = item.get_foreground_surface (draw_item_overlay);
-			
-			if (icon_overlay_surface != null) {
-				icon_cr.set_source_surface (icon_overlay_surface.Internal, 0, 0);
-				icon_cr.paint ();
-			}
-			
-#if BENCHMARK
-			var end = new DateTime.now_local ();
-			benchmark.add ("	item.get_surface time - %f ms".printf (end.difference (start) / 1000.0));
-#endif
+			Cairo.Region touched_region = new Cairo.Region ();
 			
 			// get item's draw-value
 			var draw_value = position_manager.get_draw_value_for_item (item);
@@ -495,23 +539,6 @@
 				&& !drag_manager.drop_is_accepted_by (item))
 				darken += 0.6;
 			
-			// glow the icon
-			if (lighten > 0) {
-				icon_cr.set_operator (Cairo.Operator.ADD);
-				icon_cr.paint_with_alpha (lighten);
-				icon_cr.set_operator (Cairo.Operator.OVER);
-			}
-			
-			// darken the icon
-			if (darken > 0) {
-				icon_cr.rectangle (0, 0, icon_surface.Width, icon_surface.Height);
-				icon_cr.set_source_rgba (0, 0, 0, darken);
-				
-				icon_cr.set_operator (Cairo.Operator.ATOP);
-				icon_cr.fill ();
-				icon_cr.set_operator (Cairo.Operator.OVER);
-			}
-			
 			// bounce icon on urgent state
 			if (screen_is_composited && (item.State & ItemState.URGENT) != 0) {
 				var urgent_time = frame_time - item.LastUrgent;
@@ -533,7 +560,7 @@
 					item.unset_move_state ();
 				}
 			}
-
+			
 			// draw active glow
 			var active_time = frame_time - item.LastActive;
 			var opacity = double.min (1, active_time / (double) (theme.ActiveTime * 1000));
@@ -541,34 +568,107 @@
 				opacity = 1 - opacity;
 			if (opacity > 0) {
 				theme.draw_active_glow (main_buffer, background_rect, draw_value.background_region, item.AverageIconColor, opacity, position);
-			}
-			
-			// draw the icon shadow
-			if (icon_shadow_surface != null) {
-				if (window_scale_factor > 1) {
-					shadow_cr.save ();
-					shadow_cr.scale (1.0 / window_scale_factor, 1.0 / window_scale_factor);
-				}
-				shadow_cr.set_operator (Cairo.Operator.OVER);
-				shadow_cr.set_source_surface (icon_shadow_surface.Internal, (draw_value.draw_region.x - shadow_size) * window_scale_factor, (draw_value.draw_region.y - shadow_size) * window_scale_factor);
-				shadow_cr.paint ();
-				if (window_scale_factor > 1)
-					shadow_cr.restore ();
-			}
-
+				touched_region.union_rectangle (draw_value.background_region);
+			}
+			
+			// draw shadow and bail early
+			if (shadow_only) {
+				if (shadow_size > 0)
+					touched_region.union_rectangle (draw_item_shadow (item, draw_value));
+				
+				return (Gdk.Rectangle) touched_region.get_extents ();
+			}
+			
+			// load the icon
+#if BENCHMARK
+			var start = new DateTime.now_local ();
+#endif
+			var icon_surface = item.get_surface_copy (icon_size * window_scale_factor, icon_size * window_scale_factor, main_buffer);
+			unowned Cairo.Context icon_cr = icon_surface.Context;
+			
+			DockSurface? icon_overlay_surface = null;
+			if (item.CountVisible || item.ProgressVisible)
+				icon_overlay_surface = item.get_foreground_surface (draw_item_overlay);
+			
+			if (icon_overlay_surface != null) {
+				icon_cr.set_source_surface (icon_overlay_surface.Internal, 0, 0);
+				icon_cr.paint ();
+			}
+			
+#if BENCHMARK
+			var end = new DateTime.now_local ();
+			benchmark.add ("	item.get_surface time - %f ms".printf (end.difference (start) / 1000.0));
+#endif
+			
+			// glow the icon
+			if (lighten > 0) {
+				icon_cr.set_operator (Cairo.Operator.ADD);
+				icon_cr.paint_with_alpha (lighten);
+				icon_cr.set_operator (Cairo.Operator.OVER);
+			}
+			
+			// darken the icon
+			if (darken > 0) {
+				icon_cr.rectangle (0, 0, icon_surface.Width, icon_surface.Height);
+				icon_cr.set_source_rgba (0, 0, 0, darken);
+				
+				icon_cr.set_operator (Cairo.Operator.ATOP);
+				icon_cr.fill ();
+				icon_cr.set_operator (Cairo.Operator.OVER);
+			}
+			
 			// draw the icon
 			if (window_scale_factor > 1) {
 				main_cr.save ();
 				main_cr.scale (1.0 / window_scale_factor, 1.0 / window_scale_factor);
 			}
-			main_cr.set_source_surface (icon_surface.Internal, draw_value.draw_region.x * window_scale_factor, draw_value.draw_region.y * window_scale_factor);
+			var draw_region = draw_value.draw_region;
+			var hover_region = draw_value.hover_region;
+			touched_region.union_rectangle (hover_region);
+			main_cr.set_source_surface (icon_surface.Internal, draw_region.x * window_scale_factor, draw_region.y * window_scale_factor);
 			main_cr.paint ();
 			if (window_scale_factor > 1)
 				main_cr.restore ();
 			
 			// draw indicators
 			if (item.Indicator != IndicatorState.NONE)
-				draw_indicator_state (draw_value.hover_region, item.Indicator, item.State);
+				draw_indicator_state (hover_region, item.Indicator, item.State);
+			
+			// draw shadow
+			if (shadow_size > 0)
+				touched_region.union_rectangle (draw_item_shadow (item, draw_value));
+			
+			return (Gdk.Rectangle) touched_region.get_extents ();
+		}
+		
+		Gdk.Rectangle draw_item_shadow (DockItem item, PositionManager.DockItemDrawValue draw_value)
+		{
+			unowned PositionManager position_manager = controller.position_manager;
+			var shadow_size = position_manager.IconShadowSize;
+			unowned Cairo.Context shadow_cr = shadow_buffer.Context;
+
+			// load and draw the icon shadow
+			DockSurface? icon_shadow_surface = null;
+			if (shadow_size > 0)
+				icon_shadow_surface = item.get_background_surface (draw_item_background);
+			
+			if (icon_shadow_surface != null) {
+				if (window_scale_factor > 1) {
+					shadow_cr.save ();
+					shadow_cr.scale (1.0 / window_scale_factor, 1.0 / window_scale_factor);
+				}
+				var draw_region = draw_value.draw_region;
+				shadow_cr.set_operator (Cairo.Operator.OVER);
+				shadow_cr.set_source_surface (icon_shadow_surface.Internal, (draw_region.x - shadow_size) * window_scale_factor, (draw_region.y - shadow_size) * window_scale_factor);
+				shadow_cr.paint ();
+				if (window_scale_factor > 1)
+					shadow_cr.restore ();
+				
+				return { draw_region.x - shadow_size, draw_region.y - shadow_size,
+					icon_shadow_surface.Width, icon_shadow_surface.Height };
+			}
+			
+			return {0};
 		}
 		
 		DockSurface draw_item_overlay (DockItem item, DockSurface icon_surface, DockSurface? current_surface)
@@ -599,7 +699,7 @@
 			return surface;
 		}
 		
-		DockSurface draw_item_shadow (DockItem item, DockSurface icon_surface, DockSurface? current_surface)
+		DockSurface draw_item_background (DockItem item, DockSurface icon_surface, DockSurface? current_surface)
 		{
 			unowned PositionManager position_manager = controller.position_manager;
 			var shadow_size = position_manager.IconShadowSize * window_scale_factor;
@@ -759,6 +859,18 @@
 		 */
 		protected override bool animation_needed (int64 render_time)
 		{
+			if (dock_redraw_needed (render_time))
+				return true;
+			
+			foreach (var item in controller.Items)
+				if (item_redraw_needed (item, render_time))
+					return true;
+			
+			return false;
+		}
+		
+		bool dock_redraw_needed (int64 render_time)
+		{
 			if (theme.FadeOpacity == 1.0) {
 				if (render_time - last_hide <= theme.HideTime * 1000)
 					return true;
@@ -767,24 +879,49 @@
 					return true;
 			}
 			
-			foreach (var item in controller.Items) {
-				if (item.ClickedAnimation != Animation.NONE
-					&& render_time - item.LastClicked <= (item.ClickedAnimation == Animation.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime) * 1000)
-					return true;
-				if (item.HoveredAnimation != Animation.NONE
-					&& render_time - item.LastHovered <= 150 * 1000)
-					return true;
-				if (item.ScrolledAnimation != Animation.NONE
-					&& render_time - item.LastScrolled <= 300 * 1000)
-					return true;
-				if (render_time - item.LastActive <= theme.ActiveTime * 1000)
-					return true;
-				if (render_time - item.LastUrgent <= (hide_progress == 1.0 ? theme.GlowTime : theme.UrgentBounceTime) * 1000)
-					return true;
-				if (render_time - item.LastMove <= theme.ItemMoveTime * 1000)
-					return true;
-			}
-				
+			return false;
+		}
+		
+		bool item_redraw_needed (DockItem item, int64 render_time)
+		{
+			if ((item.State & ItemState.REDRAW) != 0)
+				return true;
+			if (item.ClickedAnimation != Animation.NONE
+				&& render_time - item.LastClicked <= (item.ClickedAnimation == Animation.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime) * 1000)
+				return true;
+			if (item.HoveredAnimation != Animation.NONE
+				&& render_time - item.LastHovered <= 150 * 1000)
+				return true;
+			if (item.ScrolledAnimation != Animation.NONE
+				&& render_time - item.LastScrolled <= 300 * 1000)
+				return true;
+			if (render_time - item.LastActive <= theme.ActiveTime * 1000)
+				return true;
+			if (render_time - item.LastUrgent <= (hide_progress == 1.0 ? theme.GlowTime : theme.UrgentBounceTime) * 1000)
+				return true;
+			if (render_time - item.LastMove <= theme.ItemMoveTime * 1000)
+				return true;
+			
+			return false;
+		}
+		
+		bool item_in_transition (DockItem item, int64 render_time)
+		{
+			if (render_time - item.LastMove <= theme.ItemMoveTime * 1000)
+				return true;
+			if (item.ClickedAnimation == Animation.BOUNCE
+				&& render_time - item.LastClicked <= theme.LaunchBounceTime * 1000)
+				return true;
+			if (item.HoveredAnimation == Animation.BOUNCE
+				&& render_time - item.LastHovered <= 150 * 1000)
+				return true;
+			if (item.ScrolledAnimation == Animation.BOUNCE
+				&& render_time - item.LastScrolled <= 300 * 1000)
+				return true;
+			if (hide_progress < 1.0
+				&& render_time - item.LastUrgent <= theme.UrgentBounceTime * 1000)
+				return true;
+			
 			return false;
 		}
 	}

=== modified file 'lib/Drawing/AnimatedRenderer.vala'
--- lib/Drawing/AnimatedRenderer.vala	2014-07-20 15:18:51 +0000
+++ lib/Drawing/AnimatedRenderer.vala	2015-01-14 12:22:05 +0000
@@ -30,6 +30,9 @@
 		
 		public Gtk.Widget widget { get; construct; }
 		
+		[CCode (notify = false)]
+		public bool full_redraw { get; private set; }
+		
 		uint animation_timer = 0;
 		
 		/**
@@ -57,6 +60,27 @@
 		protected abstract bool animation_needed (int64 render_time);
 		
 		/**
+		 * Draws the widget onto the given context.
+		 *
+		 * @param cr the context to use for drawing
+		 */
+		protected abstract void draw_widget (Cairo.Context cr);
+		
+		/**
+		 * Draws the widget onto the given context.
+		 * This will call the implementation of draw_widget ().
+		 *
+		 * @param cr the context to use for drawing
+		 */
+		public void draw (Cairo.Context cr)
+		{
+			draw_widget (cr);
+			
+			if (full_redraw)
+				full_redraw = false;
+		}
+		
+		/**
 		 * Request re-drawing.
 		 */
 		public void animated_draw ()
@@ -70,6 +94,16 @@
 				animation_timer = Gdk.threads_add_timeout (1000 / FPS, draw_timeout);
 		}
 		
+		/**
+		 * Request full re-drawing.
+		 */
+		public void animated_draw_full ()
+		{
+			full_redraw = true;
+			
+			animated_draw ();
+		}
+		
 		bool draw_timeout ()
 		{
 			widget.queue_draw ();

=== modified file 'lib/Items/DockItem.vala'
--- lib/Items/DockItem.vala	2014-11-19 14:06:10 +0000
+++ lib/Items/DockItem.vala	2015-01-14 12:22:05 +0000
@@ -72,7 +72,11 @@
 		/**
 		 * The item is currently moved to its new position.
 		 */
-		MOVE = 1 << 3
+		MOVE = 1 << 3,
+		/**
+		 * The item is about to be redrawn.
+		 */
+		REDRAW = 1 << 4
 	}
 	
 	/**
@@ -248,6 +252,8 @@
 			background_surface = null;
 			foreground_surface = null;
 			
+			State |= ItemState.REDRAW;
+			
 			needs_redraw ();
 		}
 		
@@ -324,6 +330,7 @@
 				draw_icon (surface);
 				
 				AverageIconColor = surface.average_color ();
+				State &= ~ItemState.REDRAW;
 			}
 			
 			return surface;

=== modified file 'lib/PositionManager.vala'
--- lib/PositionManager.vala	2014-11-27 13:52:08 +0000
+++ lib/PositionManager.vala	2015-01-14 12:22:05 +0000
@@ -329,7 +329,7 @@
 			
 			var scaled_icon_size = IconSize / 10.0;
 			
-			IconShadowSize = (int) Math.ceil (theme.IconShadowSize * scaled_icon_size);
+			IconShadowSize = (int) (theme.IconShadowSize * scaled_icon_size);
 			IndicatorSize = (int) (theme.IndicatorSize * scaled_icon_size);
 			GlowSize      = (int) (theme.GlowSize      * scaled_icon_size);
 			HorizPadding  = (int) (theme.HorizPadding  * scaled_icon_size);
@@ -611,7 +611,7 @@
 				// With active compositing support update_size_and_position () won't trigger a redraw
 				// (a changed static_dock_region doesn't implicate the window-size changed)
 				if (screen_is_composited)
-					controller.renderer.animated_draw ();
+					controller.renderer.animated_draw_full ();
 			} else {
 				controller.renderer.animated_draw ();
 			}
@@ -1061,6 +1061,24 @@
 			return { x, y, DockBackgroundWidth, DockBackgroundHeight };
 		}
 		
+		public Gdk.Rectangle get_dock_extents ()
+		{
+			var cursor_region = get_cursor_region ();
+			
+			if (extra_hide_offset > 0)
+				rectangle_inflate (ref cursor_region, extra_hide_offset);
+			
+			return cursor_region;
+		}
+		
+		static void rectangle_inflate (ref Gdk.Rectangle rect, int size)
+		{
+			rect.x -= size;
+			rect.y -= size;
+			rect.width += 2 * size;
+			rect.height += 2 * size;
+		}
+		
 		/**
 		 * Get the item's icon geometry for the dock.
 		 *

=== modified file 'lib/Widgets/DockWindow.vala'
--- lib/Widgets/DockWindow.vala	2014-10-24 07:15:41 +0000
+++ lib/Widgets/DockWindow.vala	2015-01-14 12:22:05 +0000
@@ -308,7 +308,7 @@
 				return base.draw (cr);
 			}
 			
-			controller.renderer.draw_dock (cr);
+			controller.renderer.draw (cr);
 			set_input_mask ();
 			
 			return true;