Clone in a terminal:
Commit 216364e
Johan Mattsson - 2015-06-07T17:02:40+00:00
216364eebbc443fa45d3dea68a8c3b4ab1414eecjohan.mattsson.m@gmail.com

Store last color

Changed files (3)

Diff

diff --git a/libbirdfont/ColorPicker.vala b/libbirdfont/ColorPicker.valaindex bc43f63..2a46c59 100644--- a/libbirdfont/ColorPicker.vala+++ b/libbirdfont/ColorPicker.vala@@ -42,7 +42,7 @@ public class ColorPicker : Tool { 		});  		panel_press_action.connect ((selected, button, tx, ty) => {	-			if (y <= ty <= y + 4 * bar_height) {+			if (y <= ty <= y + 5 * bar_height) { 				update_color = true; 				selected_bar = (int) ((ty - y) / bar_height); 				set_color_from_pointer (tx);@@ -89,10 +89,6 @@ public class ColorPicker : Tool { 		return new Color.hsba (hue, s, b, a); 	} 	-	public void signal_color_updated () {-		color_updated ();-	}-	 	public override void draw_tool (Context cr, double px, double py) { 		draw_bars (cr, px, py); 		draw_dial (cr, px, py, 0, hue);diff --git a/libbirdfont/Expander.vala b/libbirdfont/Expander.valaindex c5f080c..5f1e732 100644--- a/libbirdfont/Expander.vala+++ b/libbirdfont/Expander.vala@@ -153,10 +153,6 @@ public class Expander : GLib.Object { 			foreach (Tool t in tool) { 				if (t.tool_is_visible ()) { 					new_row = xt + t.w > Toolbox.allocation_width - 7 * scale;-					-					if (t is ColorPicker) {-						content_height += t.h;-					} 										 					if (t is ZoomBar) { 						t.x = xt;diff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex 200ae1d..a7e5a74 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -759,6 +759,10 @@ public class Path { 			new_path.add_point (p); 		} 		+		if (color != null) {+			new_path.color = ((!) color).copy ();+		}+		 		new_path.edit = edit; 		new_path.open = open; 		new_path.stroke = stroke;

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112