Merge lp:~marten-truu/plank/optional-gradients into lp:plank

[truu]

Pictures should explain the mess I've made better: https://github.com/MellowKing/plank
It's a link to an earlier modification, but the new options look the same except for the additional option of a solid active item background.

Hopefully something like this would be welcome in plank for people who prefer their dock non-glowy. :)

[Rico Tzschichholz (ricotz)]

Interesting, some quick notes to begin with and this might go through some iterations ;-)

We want to keep it simple and "IndicatorStyle", "IndicatorColor" and "IndicatorSize" should be enough information to draw it. No need for "IndicatorSpacing" and "IndicatorHeight"!

"IndicatorStyle" should be an Enum.

Changes of Theme.vala should be in DockTheme.vala as well.

Btw, the official git repo is https://git.launchpad.net/plank/ (Mirrored to https://github.com/ricotz/plank)

review: Needs Information

[truu (marten-truu)]

Cool, I'll use git instead then. ^^

I'll try to remove possible need for spacing with bigger circles and see whether height or width could be in relation to something to remove the need for a height setting for underline type indicators.

[Rico Tzschichholz (ricotz)]

bzr merges are still preferred though. Of course you can keep developing in git.

[truu (marten-truu)]

Oh. :D I'll just keep using bzr for this then.

[lp:~marten-truu/plank/optional-gradients]

1550. 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.

[truu (marten-truu)]

In case of the circle indicator the size is a 50th of the icon size as opposed to a 10th, but it looks roughly the right size when compared to the other indicators. Not sure yet what to do about that.

[lp:~marten-truu/plank/optional-gradients]

1551. By truu on 2016-04-04

Removed now unnecessary space additions.

1552. By truu on 2016-04-04

Gave the active item gradientless background a smooth transition as well.

[Rico Tzschichholz (ricotz)]

I pushed some WIP to https://code.launchpad.net/~docky-core/plank/indicator-style

[Rico Tzschichholz (ricotz)]

IndicatorStyleType.LINE requires rotation support for LEFT/RIGHT docks

[lp:~marten-truu/plank/optional-gradients]

1553. By truu on 2016-04-04

Initial fix for lines when placed to the right and left.

[truu (marten-truu)]

I noticed the lines already look nice in the indicator-style branch :D

In my opinion the circles could use a slight boost off the ground and since this branch is pretty outdated now, I'll just paste the idea here. :D

=== modified file 'lib/Drawing/DockTheme.vala'
--- lib/Drawing/DockTheme.vala 2016-04-04 13:50:32 +0000
+++ lib/Drawing/DockTheme.vala 2016-04-04 18:58:53 +0000
@@ -226,6 +226,10 @@
   {
    // Force square if needed which eases the placement in renderer
    switch (IndicatorStyle) {
+ case IndicatorStyleType.CIRCLE:
+ height = height + height / 2;
+ width = height;
+ break;
    case IndicatorStyleType.LINE:
     if (position == Gtk.PositionType.LEFT
      || position == Gtk.PositionType.RIGHT) {
@@ -273,7 +277,7 @@
    case IndicatorStyleType.CIRCLE:
     var x = height / 2, y = x;
     cr.move_to (x, y);
- cr.arc (x, y, height / 2, 0, Math.PI * 2);
+ cr.arc (x, y, height / 3, 0, Math.PI * 2);
     cr.close_path ();
     cr.set_source_rgba (color.red, color.green, color.blue, color.alpha);
     break;

[Rico Tzschichholz (ricotz)]

To accomplish that there is offset_factor, but I am struggling with implementation details while this hole thing is a bit hacky and needs some further thinking.

[truu (marten-truu)]

Oh. Well if I can be of service with that somehow, I'd be happy to help. :)

Unmerged revisions

1553. By truu on 2016-04-04

Initial fix for lines when placed to the right and left.

1552. By truu on 2016-04-04

Gave the active item gradientless background a smooth transition as well.

1551. By truu on 2016-04-04

Removed now unnecessary space additions.

1550. 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.

1549. By truu on 2016-04-03

Add missing newline.

1548. 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-04 13:31:52 +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
+#Whether an item has an active background glow. If not, active-item-color (RGBA) will be used instead.
+ActiveGlow=false
+#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 color (RGBA) of the active item background.
+ActiveItemColor=0;;0;;0;;0
+#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

=== modified file 'data/themes/Makefile.am'
--- data/themes/Makefile.am	2013-11-10 12:52:40 +0000
+++ data/themes/Makefile.am	2016-04-04 13:31:52 +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 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2016-02-28 12:06:16 +0000
+++ lib/DockRenderer.vala	2016-04-04 13:31:52 +0000
@@ -937,13 +937,13 @@
 			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);
+				indicator_buffer = theme.create_indicator (position_manager.IndicatorSize, position_manager.Position, 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);
+				urgent_indicator_buffer = theme.create_indicator (position_manager.IndicatorSize, position_manager.Position, urgent_indicator_color, item_buffer);
 			}
 			
 			unowned Surface indicator_surface = (item_state & ItemState.URGENT) != 0 ? urgent_indicator_buffer : indicator_buffer;
@@ -969,15 +969,15 @@
 				break;
 			}
 			
-			if (indicator == IndicatorState.SINGLE) {
+			if (indicator == IndicatorState.SINGLE || theme.IndicatorStyle == ItemIndicatorStyle.UNDERLINE) {
 				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;
+					x_offset = position_manager.IndicatorSize * 0.15;
 				else
-					y_offset = position_manager.IconSize / 16.0;
+					y_offset = position_manager.IndicatorSize * 0.15;
 				
 				cr.set_source_surface (indicator_surface.Internal, x - x_offset, y - y_offset);
 				cr.paint ();

=== modified file 'lib/Drawing/DockTheme.vala'
--- lib/Drawing/DockTheme.vala	2016-03-12 15:14:09 +0000
+++ lib/Drawing/DockTheme.vala	2016-04-04 13:31:52 +0000
@@ -43,6 +43,9 @@
 		[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 ItemIndicatorStyle IndicatorStyle { get; set; default = ItemIndicatorStyle.CIRCLE_GLOW; }
+		
 		[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 +97,15 @@
 		[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 = "active-glow", blurb = "Whether an item has an active background glow. If not, active-item-color (RGBA) will be used instead.")]
+		public bool ActiveGlow { get; set; }
+		
+		[Description(nick = "indicator-color", blurb = "The color (RGBA) of the indicator.")]
+		public Color IndicatorColor { get; set; }
+		
+		[Description(nick = "active-item-color", blurb = "The color (RGBA) of the active item background.")]
+		public Color ActiveItemColor { get; set; }
+		
 		public DockTheme (string name)
 		{
 			base.with_name (name);
@@ -112,6 +124,7 @@
 			BottomPadding = 2.5;
 			ItemPadding = 2.5;
 			IndicatorSize = 5.0;
+			IndicatorStyle = ItemIndicatorStyle.CIRCLE_GLOW;
 			IconShadowSize = 1.0;
 			UrgentBounceHeight = 5.0 / 3.0;
 			LaunchBounceHeight = 0.625;
@@ -129,6 +142,9 @@
 			UrgentHueShift = 150;
 			ItemMoveTime = 450;
 			CascadeHide = true;
+			ActiveGlow = true;
+			IndicatorColor = { 255, 255, 255, 1.0 };
+			ActiveItemColor = { 0.0, 0.0, 0.0, 0.0 };
 		}
 		
 		/**
@@ -204,7 +220,7 @@
 		 * @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 (int size, Color color, Surface model)
+		 public Surface create_indicator (int size, Gtk.PositionType position, Color color, Surface model)
 		{
 			Logger.verbose ("DockTheme.create_indicator (size = %i)", size);
 			
@@ -213,25 +229,77 @@
 			
 			if (size <= 0)
 				return surface;
-			
+				
 			unowned Cairo.Context cr = surface.Context;
 			
-			var x = size / 2;
-			var y = x;
-			
-			cr.move_to (x, y);
-			cr.arc (x, y, size / 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);
+			switch (IndicatorStyle) {
+				case ItemIndicatorStyle.CIRCLE_GLOW:
+					var x = size / 2;
+					var y = x;
+					
+					cr.move_to (x, y);
+					cr.arc (x, y, size / 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);
+					break;
+				case ItemIndicatorStyle.CIRCLE_COLOR_GLOW:
+					var x = size / 2;
+					var y = x;
+					
+					cr.move_to (x, y);
+					cr.arc (x, y, size / 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, IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, 1 * IndicatorColor.alpha);
+					rg.add_color_stop_rgba (0.1, IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, 0.8 * IndicatorColor.alpha);
+					rg.add_color_stop_rgba (0.2, IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, 0.6 * IndicatorColor.alpha);
+					rg.add_color_stop_rgba (0.25, IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, 0.25 * IndicatorColor.alpha);
+					rg.add_color_stop_rgba (0.5, IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, 0.15 * IndicatorColor.alpha);
+					rg.add_color_stop_rgba (1.0, IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, 0.0 * IndicatorColor.alpha);
+					
+					cr.set_source (rg);
+					break;
+				case ItemIndicatorStyle.CIRCLE:
+					var x = size / 2.0;
+					var y = size / 2.5;
+					
+					cr.move_to (x, y);
+					cr.arc (x, y, size / 10.0, 0, Math.PI * 2);
+					cr.close_path ();
+					cr.set_source_rgba (IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, IndicatorColor.alpha);
+					break;
+				case ItemIndicatorStyle.UNDERLINE:
+					if (position == Gtk.PositionType.RIGHT || position == Gtk.PositionType.LEFT) {
+						var x = size / 2;
+						var y = 0;
+						cr.move_to (x, y);
+						cr.rel_line_to (0, size);
+						cr.rel_line_to (position == Gtk.PositionType.RIGHT ? size / 8 : -size / 8, 0);
+						cr.rel_line_to (0, -size);
+						cr.rel_line_to (position == Gtk.PositionType.RIGHT ? -size / 8 : size / 8, 0);
+					} else {
+						var x = 0;
+						var y = position == Gtk.PositionType.BOTTOM ? size / 2 : size / 2.5;
+						cr.move_to (x, y);
+						cr.rel_line_to (size, 0);
+						cr.rel_line_to (0, size / 8);
+						cr.rel_line_to (-size, 0);
+						cr.rel_line_to (0, -size / 8);
+					}
+					cr.set_source_rgba (IndicatorColor.red, IndicatorColor.green, IndicatorColor.blue, IndicatorColor.alpha);
+					break;
+			}
+			
 			cr.fill ();
 			
 			return surface;
@@ -339,12 +407,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 (ActiveGlow) {
+				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(ActiveItemColor.red, ActiveItemColor.green, ActiveItemColor.blue, ActiveItemColor.alpha * opacity);
+			}
+			
 			cr.fill ();
 			
 			cr.reset_clip ();
@@ -568,6 +641,11 @@
 					IconShadowSize = MAX_ICON_SHADOW_SIZE;
 				break;
 			
+			case "IndicatorStyle":
+				if (IndicatorStyle < 0 || IndicatorStyle > 3)
+					IndicatorStyle = ItemIndicatorStyle.CIRCLE_GLOW;
+				break;
+			
 			case "UrgentBounceHeight":
 				if (UrgentBounceHeight < 0)
 					UrgentBounceHeight = 0;
@@ -641,6 +719,12 @@
 				else if (UrgentHueShift > 180)
 					UrgentHueShift = 180;
 				break;
+			
+			case "IndicatorColor":
+				break;
+			
+			case "ActiveItemColor":
+				break;
 			}
 		}
 	}

=== modified file 'lib/Items/Enums.vala'
--- lib/Items/Enums.vala	2015-11-03 10:37:19 +0000
+++ lib/Items/Enums.vala	2016-04-04 13:31:52 +0000
@@ -135,4 +135,26 @@
 			}
 		}
 	}
+	/**
+	 * The style of the item indicator.
+	 */
+	public enum ItemIndicatorStyle
+	{
+		/**
+		 * A glowing circle with the default color.
+		 */
+		CIRCLE_GLOW,
+		/**
+		 * A glowing circle with a theme-defined color.
+		 */
+		CIRCLE_COLOR_GLOW,
+		/**
+		 * A filled circle with a theme-defined color.
+		 */
+		CIRCLE,
+		/**
+		 * A line under the icon.
+		 */
+		UNDERLINE
+	}
 }

=== modified file 'tests/Drawing.vala'
--- tests/Drawing.vala	2015-11-03 10:40:13 +0000
+++ tests/Drawing.vala	2016-04-04 13:31:52 +0000
@@ -421,9 +421,9 @@
 		docktheme = new DockTheme ("Test");
 		Color color = { 0.5, 0.4, 0.3, 1.0 };
 		
-		surface2 = docktheme.create_indicator (-1, color, surface);
-		surface2 = docktheme.create_indicator (64, color, surface);
-		surface2 = docktheme.create_indicator (512, color, surface);
+		surface2 = docktheme.create_indicator (-1, Gtk.PositionType.BOTTOM, color, surface);
+		surface2 = docktheme.create_indicator (64, Gtk.PositionType.RIGHT, color, surface);
+		surface2 = docktheme.create_indicator (512, Gtk.PositionType.LEFT, color, surface);
 	}
 	
 	void drawing_theme_create_urgent_glow ()