Merge lp:~docky-core/plank/indicator-style into lp:plank

[Rico Tzschichholz]

* Reworked indicator-drawing while adding some styles

(Branch will get rebased and squashed in self-contained/logical commits)

TODO:
* Naming of new theme-settings needs some more thinking
* Add new theme "Modern" / "Flat" (?) which makes use of the new features

THOUGHTS:
* Moving caching in the theme rather than handle it in the renderer?

[truu (marten-truu)]

Theme naming:
I'd vote for "flat" in case of a theme with the line type indicator and "modern" in case of the circle.

Looks:
The circular ones look better if their center is in the middle of bottom padding: http://imgur.com/co1S0t7
An extra slight bump off the ground instead might look better too.

The circles also end up a bit too close together at times, depending on the size set (indicatorsize 1 looked to be too close, while 1.2 looked fine at icon size 48)
http://imgur.com/sUCYEoN

In my opinion lines should not indicate several instances being open, as it appears strange :D
Neither chrome os nor windows seem to provide such information while having that kind of indicators. It feels as if the application were somehow divided into smaller fragments.

review: Needs Information (testing)

[lp:~docky-core/plank/indicator-style]

1550. By Rico Tzschichholz on 2016-04-07

surface: Some minor cleaning

[Rico Tzschichholz (ricotz)]

> Theme naming:
> I'd vote for "flat" in case of a theme with the line type indicator and
> "modern" in case of the circle.

Let's see how this turns out when the styles are finished ;-)

> Looks:
> The circular ones look better if their center is in the middle of bottom
> padding: http://imgur.com/co1S0t7
> An extra slight bump off the ground instead might look better too.

I am not really convinced here.

> The circles also end up a bit too close together at times, depending on the
> size set (indicatorsize 1 looked to be too close, while 1.2 looked fine at
> icon size 48)
> http://imgur.com/sUCYEoN

Should be better now

> In my opinion lines should not indicate several instances being open, as it
> appears strange :D
> Neither chrome os nor windows seem to provide such information while having
> that kind of indicators. It feels as if the application were somehow divided
> into smaller fragments.

I agree here.

[truu (marten-truu)]

stroke_preserve seems to make the indicators strangely fuzzy :D
Can't really tell with circles but it's very noticeable with lines.

The lines are also now lifted slightly off the ground by about the amount that I like the indicators to be. But I suppose that's a up to personal preference.

I'll also add a side-by-side of the lifted and not circles with values I'd actually use:
http://imgur.com/oicu9Kp
Perhaps of some use as reference when deciding which way to go.

tldr: imo the lines should be grounded and not fuzzy.

[lp:~docky-core/plank/indicator-style]

1551. By Rico Tzschichholz on 2016-04-10

drawing/color: Add support for HSL and some convenience functions

1555. By Rico Tzschichholz on 2016-04-04

WIP

1556. By Rico Tzschichholz on 2016-04-06

WIP

1557. By Rico Tzschichholz on 2016-04-07

WIP

1558. By Rico Tzschichholz on 2016-04-09

WIP

1559. By Rico Tzschichholz on 2016-04-09

WIP

[Rico Tzschichholz (ricotz)]

Moved to https://git.launchpad.net/plank/log/?h=wip/indicator-style

Unmerged revisions

1559. By Rico Tzschichholz on 2016-04-09

WIP

1558. By Rico Tzschichholz on 2016-04-09

WIP

1557. By Rico Tzschichholz on 2016-04-07

WIP

1556. By Rico Tzschichholz on 2016-04-06

WIP

1555. By Rico Tzschichholz on 2016-04-04

WIP

1554. By truu on 2016-04-03

Removed Spacing and Height options, probably created a weird style enum in a weird place and put some things where they should've been put all along.

1553. By truu on 2016-04-03

Add missing newline.

1552. By truu on 2016-04-03

Makes gradients optional by adding a few theming options.

=== added directory 'data/themes/Glowless'
=== added file 'data/themes/Glowless/dock.theme'
--- data/themes/Glowless/dock.theme	1970-01-01 00:00:00 +0000
+++ data/themes/Glowless/dock.theme	2016-04-10 16:22:24 +0000
@@ -0,0 +1,70 @@
+
+[PlankTheme]
+#The roundness of the top corners.
+TopRoundness=4
+#The roundness of the bottom corners.
+BottomRoundness=0
+#The thickness (in pixels) of lines drawn.
+LineWidth=0
+#The color (RGBA) of the outer stroke.
+OuterStrokeColor=255;;255;;255;;200
+#The starting color (RGBA) of the fill gradient.
+FillStartColor=38;;50;;56;;200
+#The ending color (RGBA) of the fill gradient.
+FillEndColor=38;;50;;56;;200
+#The color (RGBA) of the inner stroke.
+InnerStrokeColor=2;;2;;2;;0
+
+[PlankDockTheme]
+#The padding on the left/right dock edges, in tenths of a percent of IconSize.
+HorizPadding=1
+#The padding on the top dock edge, in tenths of a percent of IconSize.
+TopPadding=1
+#The padding on the bottom dock edge, in tenths of a percent of IconSize.
+BottomPadding=1.5
+#The padding between items on the dock, in tenths of a percent of IconSize.
+ItemPadding=2
+#The size of item indicators, in tenths of a percent of IconSize.
+IndicatorSize=5
+#The size of the icon-shadow behind every item, in tenths of a percent of IconSize.
+IconShadowSize=1
+#The style of item indicators (values 0 - 3), styles: 0 - circle-glow, 1 - circle-color-glow, 2 - circle, 3 - underline.
+IndicatorStyle=2
+#The color (RGBA) of the indicator.
+IndicatorColor=225;;225;;225;;255
+#The height (in percent of IconSize) to bounce an icon when the application sets urgent.
+UrgentBounceHeight=1.6666666666666667
+#The height (in percent of IconSize) to bounce an icon when launching an application.
+LaunchBounceHeight=0.625
+#The opacity value (0 to 1) to fade the dock to when hiding it.
+FadeOpacity=1
+#The amount of time (in ms) for click animations.
+ClickTime=300
+#The amount of time (in ms) to bounce an urgent icon.
+UrgentBounceTime=600
+#The amount of time (in ms) to bounce an icon when launching an application.
+LaunchBounceTime=600
+#The amount of time (in ms) for active window indicator animations.
+ActiveTime=300
+#The amount of time (in ms) to slide icons into/out of the dock.
+SlideTime=300
+#The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1).
+FadeTime=250
+#The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1).
+HideTime=250
+#The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize.
+GlowSize=30
+#The total time (in ms) to show the hidden-dock urgent glow.
+GlowTime=10000
+#The time (in ms) of each pulse of the hidden-dock urgent glow.
+GlowPulseTime=2000
+#The hue-shift (-180 to 180) of the urgent indicator color.
+UrgentHueShift=150
+#The time (in ms) to move an item to its new position or its addition/removal to/from the dock.
+ItemMoveTime=450
+#Whether background and icons will unhide/hide with different speeds. The top-border of both will leave/hit the screen-edge at the same time.
+CascadeHide=true
+#Whether an item has an active background glow. If not, active-item-color (RGBA) will be used instead.
+SelectionStyle=1
+#The color (RGBA) of the active item background.
+SelectionColor=0;;0;;0;;0
 
=== modified file 'data/themes/Makefile.am'
--- data/themes/Makefile.am	2013-11-10 12:52:40 +0000
+++ data/themes/Makefile.am	2016-04-10 16:22:24 +0000
@@ -14,3 +14,8 @@
 dist_transparenttheme_DATA = \
 	Transparent/dock.theme \
 	$(NULL)
+
+glowlessthemedir = $(pkgdatadir)/themes/Glowless
+dist_glowlesstheme_DATA = \
+	Glowless/dock.theme \
+	$(NULL)
 
=== modified file 'docs/Makefile.am'
--- docs/Makefile.am	2016-02-28 12:06:16 +0000
+++ docs/Makefile.am	2016-04-10 16:22:24 +0000
@@ -34,6 +34,7 @@
 	$(top_srcdir)/lib/Drawing/DrawingService.vala \
 	$(top_srcdir)/lib/Drawing/DockTheme.vala \
 	$(top_srcdir)/lib/Drawing/Easing.vala \
+	$(top_srcdir)/lib/Drawing/Enums.vala \
 	$(top_srcdir)/lib/Drawing/Renderer.vala \
 	$(top_srcdir)/lib/Drawing/Surface.vala \
 	$(top_srcdir)/lib/Drawing/SurfaceCache.vala \
 
=== modified file 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2016-02-28 12:06:16 +0000
+++ lib/DockRenderer.vala	2016-04-10 16:22:24 +0000
@@ -59,8 +59,8 @@
 		
 		Surface? background_buffer = null;
 		Gdk.Rectangle background_rect;
-		Surface? indicator_buffer = null;
-		Surface? urgent_indicator_buffer = null;
+		Surface[] indicator_buffer = new Surface[2];
+		Surface[] urgent_indicator_buffer = new Surface[2];
 		Surface? urgent_glow_buffer = null;
 		
 		int64 last_hide = 0LL;
@@ -209,8 +209,10 @@
 			shadow_buffer = null;
 			
 			background_buffer = null;
-			indicator_buffer = null;
-			urgent_indicator_buffer = null;
+			indicator_buffer[0] = null;
+			indicator_buffer[1] = null;
+			urgent_indicator_buffer[0] = null;
+			urgent_indicator_buffer[1] = null;
 			urgent_glow_buffer = null;
 			
 			animated_draw ();
@@ -819,7 +821,8 @@
 			if ((item.State & ItemState.ACTIVE) == 0)
 				opacity = 1 - opacity;
 			if (opacity > 0) {
-				theme.draw_active_glow (item_buffer, background_rect, draw_value.background_region, item.AverageIconColor, opacity, position);
+				var color = (theme.SelectionStyle == SelectionStyleType.LEGACY ? item.AverageIconColor : theme.SelectionColor);
+				theme.draw_active_glow (item_buffer, background_rect, draw_value.background_region, color, opacity, position);
 			}
 			
 			// draw the icon
@@ -837,7 +840,7 @@
 				cr.restore ();
 			
 			// draw indicators
-			if (draw_value.show_indicator && item.Indicator != IndicatorState.NONE)
+			if (draw_value.show_indicator)
 				draw_indicator_state (cr, draw_value.hover_region, item.Indicator, item.State);
 		}
 		
@@ -877,7 +880,7 @@
 			var surface = new Surface.with_surface (width, height, model);
 			
 			var icon_size = int.min (width, height);
-			var urgent_color = get_styled_color ();
+			var urgent_color = (theme.IndicatorStyle == IndicatorStyleType.LEGACY ? get_styled_color () : theme.IndicatorColor);
 			urgent_color.add_hue (theme.UrgentHueShift);
 			
 			// draw item's count
@@ -930,60 +933,50 @@
 			return surface;
 		}
 		
-		void draw_indicator_state (Cairo.Context cr, Gdk.Rectangle item_rect, IndicatorState indicator, ItemState item_state)
+		void draw_indicator_state (Cairo.Context cr, Gdk.Rectangle item_rect, IndicatorState indicator_state, ItemState item_state)
 		{
+			if (indicator_state == IndicatorState.NONE || theme.IndicatorSize <= 0)
+				return;
+			
 			unowned PositionManager position_manager = controller.position_manager;
-			
-			if (indicator_buffer == null) {
-				var indicator_color = get_styled_color ();
-				indicator_color.set_min_sat (0.4);
-				indicator_buffer = theme.create_indicator (position_manager.IndicatorSize, indicator_color, item_buffer);
-			}
-			if (urgent_indicator_buffer == null) {
-				var urgent_indicator_color = get_styled_color ();
-				urgent_indicator_color.add_hue (theme.UrgentHueShift);
-				urgent_indicator_color.set_sat (1.0);
-				urgent_indicator_buffer = theme.create_indicator (position_manager.IndicatorSize, urgent_indicator_color, item_buffer);
-			}
-			
-			unowned Surface indicator_surface = (item_state & ItemState.URGENT) != 0 ? urgent_indicator_buffer : indicator_buffer;
+			unowned Surface indicator_surface;
+			var index = indicator_state - 1;
+			
+			if ((item_state & ItemState.URGENT) == 0) {
+				if (indicator_buffer[index] == null)
+					indicator_buffer[index] = theme.create_indicator_for_state (indicator_state, ItemState.NORMAL,
+						position_manager.IconSize, position_manager.Position, item_buffer);
+				indicator_surface = indicator_buffer[index];
+			} else {
+				if (urgent_indicator_buffer[index] == null)
+					urgent_indicator_buffer[index] = theme.create_indicator_for_state (indicator_state, ItemState.URGENT,
+						position_manager.IconSize, position_manager.Position, item_buffer);
+				indicator_surface = urgent_indicator_buffer[index];
+			}
 			
 			var x = 0.0, y = 0.0;
 			switch (position_manager.Position) {
 			default:
 			case Gtk.PositionType.BOTTOM:
 				x = item_rect.x + item_rect.width / 2.0 - indicator_surface.Width / 2.0;
-				y = item_buffer.Height - indicator_surface.Height / 2.0 - 2.0 * theme.get_bottom_offset () - indicator_surface.Height / 24.0;
+				y = item_buffer.Height - theme.get_bottom_offset () - indicator_surface.Height;
 				break;
 			case Gtk.PositionType.TOP:
 				x = item_rect.x + item_rect.width / 2.0 - indicator_surface.Width / 2.0;
-				y = - indicator_surface.Height / 2.0 + 2.0 * theme.get_bottom_offset () + indicator_surface.Height / 24.0;
+				y = theme.get_bottom_offset ();
 				break;
 			case Gtk.PositionType.LEFT:
-				x = - indicator_surface.Width / 2.0 + 2.0 * theme.get_bottom_offset () + indicator_surface.Width / 24.0;
+				x = theme.get_bottom_offset ();
 				y = item_rect.y + item_rect.height / 2.0 - indicator_surface.Height / 2.0;
 				break;
 			case Gtk.PositionType.RIGHT:
-				x = item_buffer.Width - indicator_surface.Width / 2.0 - 2.0 * theme.get_bottom_offset () - indicator_surface.Width / 24.0;
+				x = item_buffer.Width - theme.get_bottom_offset () - indicator_surface.Width;
 				y = item_rect.y + item_rect.height / 2.0 - indicator_surface.Height / 2.0;
 				break;
 			}
 			
-			if (indicator == IndicatorState.SINGLE) {
-				cr.set_source_surface (indicator_surface.Internal, x, y);
-				cr.paint ();
-			} else {
-				var x_offset = 0.0, y_offset = 0.0;
-				if (position_manager.is_horizontal_dock ())
-					x_offset = position_manager.IconSize / 16.0;
-				else
-					y_offset = position_manager.IconSize / 16.0;
-				
-				cr.set_source_surface (indicator_surface.Internal, x - x_offset, y - y_offset);
-				cr.paint ();
-				cr.set_source_surface (indicator_surface.Internal, x + x_offset, y + y_offset);
-				cr.paint ();
-			}
+			cr.set_source_surface (indicator_surface.Internal, x, y);
+			cr.paint ();
 		}
 		
 		void draw_urgent_glow (DockItem item, Cairo.Context cr, int64 frame_time)
@@ -999,7 +992,7 @@
 			var x_offset = 0, y_offset = 0;
 			
 			if (urgent_glow_buffer == null) {
-				var urgent_color = get_styled_color ();
+				var urgent_color = (theme.IndicatorStyle == IndicatorStyleType.LEGACY ? get_styled_color () : theme.IndicatorColor);
 				urgent_color.add_hue (theme.UrgentHueShift);
 				urgent_color.set_sat (1.0);
 				urgent_glow_buffer = theme.create_urgent_glow (position_manager.GlowSize, urgent_color, main_buffer);
 
=== modified file 'lib/Drawing/DockTheme.vala'
--- lib/Drawing/DockTheme.vala	2016-03-12 15:14:09 +0000
+++ lib/Drawing/DockTheme.vala	2016-04-10 16:22:24 +0000
@@ -40,9 +40,15 @@
 		[Description(nick = "item-padding", blurb = "The padding between items on the dock, in tenths of a percent of IconSize.")]
 		public double ItemPadding { get; set; }
 		
+		[Description(nick = "indicator-color", blurb = "The color (RGBA) of the indicator.")]
+		public Color IndicatorColor { get; set; }
+		
 		[Description(nick = "indicator-size", blurb = "The size of item indicators, in tenths of a percent of IconSize.")]
 		public double IndicatorSize { get; set; }
 		
+		[Description(nick = "indicator-style", blurb = "The style of item indicators, styles: circle-glow, circle-color-glow, circle, underline.")]
+		public IndicatorStyleType IndicatorStyle { get; set; }
+		
 		[Description(nick = "icon-shadow-size", blurb = "The size of the icon-shadow behind every item, in tenths of a percent of IconSize.")]
 		public double IconShadowSize { get; set; }
 		
@@ -94,6 +100,12 @@
 		[Description(nick = "cascade-hide", blurb = "Whether background and icons will unhide/hide with different speeds. The top-border of both will leave/hit the screen-edge at the same time.")]
 		public bool CascadeHide { get; set; }
 		
+		[Description(nick = "selection-style", blurb = "Whether an item has an active background glow. If not, active-item-color (RGBA) will be used instead.")]
+		public SelectionStyleType SelectionStyle { get; set; }
+		
+		[Description(nick = "selection-color", blurb = "The color (RGBA) of the active item background.")]
+		public Color SelectionColor { get; set; }
+		
 		public DockTheme (string name)
 		{
 			base.with_name (name);
@@ -111,7 +123,9 @@
 			TopPadding = -11.0;
 			BottomPadding = 2.5;
 			ItemPadding = 2.5;
+			IndicatorColor = { 1.0, 1.0, 1.0, 1.0 };
 			IndicatorSize = 5.0;
+			IndicatorStyle = IndicatorStyleType.LEGACY;
 			IconShadowSize = 1.0;
 			UrgentBounceHeight = 5.0 / 3.0;
 			LaunchBounceHeight = 0.625;
@@ -129,6 +143,8 @@
 			UrgentHueShift = 150;
 			ItemMoveTime = 450;
 			CascadeHide = true;
+			SelectionColor = { 0.0, 0.0, 0.0, 1.0 };
+			SelectionStyle = SelectionStyleType.LEGACY;
 		}
 		
 		/**
@@ -238,6 +254,112 @@
 		}
 		
 		/**
+		 * Creates a surface of an indicator for the given states.
+		 *
+		 * @param indicator_state the state of indicator
+		 * @param item_state the state of item
+		 * @param icon_size the size of icons
+		 * @param color the color of the indicator
+		 * @param position the position of the dock
+		 * @param model existing surface to use as basis of new surface
+		 * @return a new surface with the indicator drawn on it
+		 */
+		public Surface create_indicator_for_state (IndicatorState indicator_state, ItemState item_state, int icon_size,
+			Gtk.PositionType position, Surface model)
+		{
+			double width = icon_size;
+			double height = icon_size / 3.0 + get_bottom_offset ();
+			var size = (int) (IndicatorSize * icon_size / 10.0);
+			
+			Logger.verbose ("DockTheme.create_indicator (width = %i, height = %i, state = [%i,%i])", (int) width, (int) height, indicator_state, item_state);
+			
+			var surface = new Surface.with_surface ((int) width, (int) height, model);
+			surface.clear ();
+			
+			if (width <= 0 || height <= 0 || size <= 0 || indicator_state == IndicatorState.NONE)
+				return surface;
+			
+			Color color;
+			if ((item_state & ItemState.URGENT) != 0) {
+				color = (IndicatorStyle == IndicatorStyleType.LEGACY ? get_styled_color () : IndicatorColor);
+				color.add_hue (UrgentHueShift);
+				color.set_sat (1.0);
+			} else {
+				if (IndicatorStyle == IndicatorStyleType.LEGACY) {
+					color = get_styled_color ();
+					color.set_min_sat (0.4);
+				} else {
+					color = IndicatorColor;
+				}
+			}
+			
+			unowned Cairo.Context cr = surface.Context;
+			cr.save ();
+			cr.set_line_width (1.0);
+			
+			switch (IndicatorStyle) {
+			default:
+			case IndicatorStyleType.LEGACY:
+			case IndicatorStyleType.GLOW:
+				var x = 0.0;
+				var y = Math.round (height - size / 12.0 - get_bottom_offset ());
+				
+				for (var i = 0; i < indicator_state; i++) {
+					x = Math.round (width / 2.0 + (2.0 * i - (indicator_state - 1)) * size / 8.0);
+					
+					cr.move_to (x, y);
+					cr.arc (x, y, height / 2, 0, Math.PI * 2);
+					cr.close_path ();
+					
+					var rg = new Cairo.Pattern.radial (x, y, 0, x, y, size / 2);
+					rg.add_color_stop_rgba (0, 1, 1, 1, 1);
+					rg.add_color_stop_rgba (0.1, color.red, color.green, color.blue, 1);
+					rg.add_color_stop_rgba (0.2, color.red, color.green, color.blue, 0.6);
+					rg.add_color_stop_rgba (0.25, color.red, color.green, color.blue, 0.25);
+					rg.add_color_stop_rgba (0.5, color.red, color.green, color.blue, 0.15);
+					rg.add_color_stop_rgba (1.0, color.red, color.green, color.blue, 0.0);
+					
+					cr.set_source (rg);
+					cr.fill ();
+				}
+				break;
+			case IndicatorStyleType.CIRCLE:
+				var x = 0.0;
+				var y = Math.round (height - size / 1.666 - get_bottom_offset ());
+				
+				for (var i = 0; i < indicator_state; i++) {
+					x = Math.round (width / 2.0 + (2.0 * i - (indicator_state - 1)) * size / 1.2);
+					
+					cr.move_to (x, y);
+					cr.arc (x, y, size / 2, 0, Math.PI * 2);
+					cr.close_path ();
+					
+					cr.set_source_rgba (color.red, color.green, color.blue, color.alpha);
+					cr.stroke_preserve ();
+					cr.fill ();
+				}
+				break;
+			case IndicatorStyleType.LINE:
+				var x = Math.round (icon_size / 10.0);
+				var y = Math.round (height - size - get_bottom_offset () - icon_size / 30.0);
+				width = Math.round (width - icon_size / 5.0);
+				
+				cr.rectangle (x, y, width, size);
+				cr.set_source_rgba (color.red, color.green, color.blue, color.alpha);
+				cr.stroke_preserve ();
+				cr.fill ();
+				break;
+			}
+			
+			cr.restore ();
+			
+			if (position != Gtk.PositionType.BOTTOM)
+				surface = rotate_for_position ((owned) surface, position);
+			
+			return surface;
+		}
+		
+		/**
 		 * Creates a surface for an urgent glow.
 		 *
 		 * @param size the size of the urgent glow
@@ -339,12 +461,17 @@
 			
 			cr.set_line_width (LineWidth);
 			cr.clip ();
-
-			gradient.add_color_stop_rgba (0, color.red, color.green, color.blue, 0);
-			gradient.add_color_stop_rgba (1, color.red, color.green, color.blue, 0.6 * opacity);
 			
 			cr.rectangle (rect.x, rect.y, rect.width, rect.height);
-			cr.set_source (gradient);
+			
+			if (SelectionStyle == SelectionStyleType.LEGACY) {
+				gradient.add_color_stop_rgba (0, color.red, color.green, color.blue, 0);
+				gradient.add_color_stop_rgba (1, color.red, color.green, color.blue, 0.6 * opacity);
+				cr.set_source (gradient);
+			} else {
+				cr.set_source_rgba (color.red, color.green, color.blue, color.alpha * opacity);
+			}
+			
 			cr.fill ();
 			
 			cr.reset_clip ();
@@ -568,6 +695,11 @@
 					IconShadowSize = MAX_ICON_SHADOW_SIZE;
 				break;
 			
+			case "IndicatorStyle":
+				if (IndicatorStyle < 0 || IndicatorStyle > 3)
+					IndicatorStyle = IndicatorStyleType.LEGACY;
+				break;
+			
 			case "UrgentBounceHeight":
 				if (UrgentBounceHeight < 0)
 					UrgentBounceHeight = 0;
@@ -641,7 +773,63 @@
 				else if (UrgentHueShift > 180)
 					UrgentHueShift = 180;
 				break;
-			}
+			
+			case "IndicatorColor":
+				break;
+			
+			case "ActiveItemColor":
+				break;
+			}
+		}
+		
+		static Surface rotate_for_position (owned Surface surface, Gtk.PositionType position)
+		{
+			if (position == Gtk.PositionType.BOTTOM)
+				return surface;
+			
+			Surface result;
+			var width = surface.Width;
+			var height = surface.Height;
+			var rotate = 0.0;
+			
+			if (position == Gtk.PositionType.TOP)
+				result = new Surface.with_surface (width, height, surface);
+			else
+				result = new Surface.with_surface (height, width, surface);
+			
+			unowned Cairo.Context cr = result.Context;
+			
+			switch (position) {
+			case Gtk.PositionType.TOP:
+				rotate = Math.PI;
+				break;
+			case Gtk.PositionType.LEFT:
+				rotate = Math.PI_2;
+				break;
+			case Gtk.PositionType.RIGHT:
+				rotate = -Math.PI_2;
+				break;
+			default:
+				assert_not_reached ();
+			}
+			
+			cr.save ();
+			cr.translate (result.Width / 2.0, result.Height / 2.0);
+			cr.rotate (rotate);
+			cr.translate (- width / 2.0, - height / 2.0);
+			cr.set_source_surface (surface.Internal, 0.0, 0.0);
+			cr.paint ();
+			cr.restore ();
+			
+			return result;
+		}
+		
+		Color get_styled_color ()
+		{
+			unowned Gtk.StyleContext context = get_style_context ();
+			var color = (Color) context.get_background_color (context.get_state ());
+			color.set_min_val (90 / (double) uint16.MAX);
+			return color;
 		}
 	}
 }
 
=== added file 'lib/Drawing/Enums.vala'
--- lib/Drawing/Enums.vala	1970-01-01 00:00:00 +0000
+++ lib/Drawing/Enums.vala	2016-04-10 16:22:24 +0000
@@ -0,0 +1,63 @@
+//
+//  Copyright (C) 2016 Rico Tzschichholz
+//
+//  This file is part of Plank.
+//
+//  Plank is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Plank is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+namespace Plank
+{
+	/**
+	 * The style of the item indicator.
+	 */
+	public enum IndicatorStyleType
+	{
+		/**
+		 * A glowing dot which is gtk-theme-colored.
+		 */
+		LEGACY,
+		/**
+		 * A glowing dot.
+		 */
+		GLOW,
+		/**
+		 * A solid circle.
+		 */
+		CIRCLE,
+		/**
+		 * A solid line.
+		 */
+		LINE
+	}
+	
+	/**
+	 * The style of the item indicator.
+	 */
+	public enum SelectionStyleType
+	{
+		/**
+		 * A vertical gradient which is colored based of the item's icon'.
+		 */
+		LEGACY,
+		/**
+		 * A vertical gradient.
+		 */
+		GRADIENT,
+		/**
+		 * A solid color.
+		 */
+		SOLID
+	}
+}
 
=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2016-02-28 12:06:16 +0000
+++ lib/Makefile.am	2016-04-10 16:22:24 +0000
@@ -75,6 +75,7 @@
 	Drawing/DrawingService.vala \
 	Drawing/DockTheme.vala \
 	Drawing/Easing.vala \
+	Drawing/Enums.vala \
 	Drawing/Renderer.vala \
 	Drawing/Surface.vala \
 	Drawing/SurfaceCache.vala \
 
=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2016-04-10 09:00:49 +0000
+++ lib/libplank.symbols	2016-04-10 16:22:24 +0000
@@ -340,10 +340,13 @@
 plank_dock_theme_construct
 plank_dock_theme_create_background
 plank_dock_theme_create_indicator
+plank_dock_theme_create_indicator_for_state
 plank_dock_theme_create_urgent_glow
 plank_dock_theme_draw_active_glow
 plank_dock_theme_draw_item_count
 plank_dock_theme_draw_item_progress
+plank_dock_theme_get_ActiveGlow
+plank_dock_theme_get_ActiveItemColor
 plank_dock_theme_get_ActiveTime
 plank_dock_theme_get_BottomPadding
 plank_dock_theme_get_CascadeHide
@@ -356,7 +359,9 @@
 plank_dock_theme_get_HideTime
 plank_dock_theme_get_HorizPadding
 plank_dock_theme_get_IconShadowSize
+plank_dock_theme_get_IndicatorColor
 plank_dock_theme_get_IndicatorSize
+plank_dock_theme_get_IndicatorStyle
 plank_dock_theme_get_ItemMoveTime
 plank_dock_theme_get_ItemPadding
 plank_dock_theme_get_LaunchBounceHeight
@@ -368,6 +373,8 @@
 plank_dock_theme_get_UrgentBounceTime
 plank_dock_theme_get_UrgentHueShift
 plank_dock_theme_new
+plank_dock_theme_set_ActiveGlow
+plank_dock_theme_set_ActiveItemColor
 plank_dock_theme_set_ActiveTime
 plank_dock_theme_set_BottomPadding
 plank_dock_theme_set_CascadeHide
@@ -380,7 +387,9 @@
 plank_dock_theme_set_HideTime
 plank_dock_theme_set_HorizPadding
 plank_dock_theme_set_IconShadowSize
+plank_dock_theme_set_IndicatorColor
 plank_dock_theme_set_IndicatorSize
+plank_dock_theme_set_IndicatorStyle
 plank_dock_theme_set_ItemMoveTime
 plank_dock_theme_set_ItemPadding
 plank_dock_theme_set_LaunchBounceHeight
@@ -462,6 +471,7 @@
 plank_hover_window_set_text
 plank_hover_window_show_at
 plank_indicator_state_get_type
+plank_indicator_style_type_get_type
 plank_item_factory_construct
 plank_item_factory_default_make_element
 plank_item_factory_get_item_for_dock