Set rsb and lsb values from text input in spacing tab

Changed files (3)

• modified libbirdfont/BackgroundTools.vala
• modified libbirdfont/KerningDisplay.vala
• modified libbirdfont/SpacingTab.vala

Diff

diff --git a/libbirdfont/BackgroundTools.vala b/libbirdfont/BackgroundTools.valaindex c2fdfa4..e1ab786 100644--- a/libbirdfont/BackgroundTools.vala+++ b/libbirdfont/BackgroundTools.vala@@ -23,7 +23,7 @@ public class BackgroundTools : ToolCollection  { 	public Gee.ArrayList<Expander> expanders = new Gee.ArrayList<Expander> (); 	 	public BackgroundTools () {-		Expander background_tools = new Expander (t_("Select Background Image"));+		Expander background_tools = new Expander (t_("Background Image")); 		Expander background_selection = new Expander (t_("Images")); 		 		Expander font_name = new Expander ();diff --git a/libbirdfont/KerningDisplay.vala b/libbirdfont/KerningDisplay.valaindex e2331cc..81b41f1 100644--- a/libbirdfont/KerningDisplay.vala+++ b/libbirdfont/KerningDisplay.vala@@ -33,7 +33,7 @@ public class KerningDisplay : FontDisplay { 	 	double last_handle_x = 0; 	-	bool text_input = false;+	public bool text_input = false;  	Gee.ArrayList<UndoItem> undo_items; 	Gee.ArrayList<UndoItem> redo_items;@@ -847,10 +847,6 @@ public class KerningDisplay : FontDisplay { 	} 	 	public override void button_press (uint button, double ex, double ey) {-		if (MenuTab.suppress_event) {-			return;-		}-		 		set_active_handle (ex, ey); 		set_selected_handle (active_handle); 		begin_handle_x = ex;diff --git a/libbirdfont/SpacingTab.vala b/libbirdfont/SpacingTab.valaindex dc0b97a..3e060ad 100644--- a/libbirdfont/SpacingTab.vala+++ b/libbirdfont/SpacingTab.vala@@ -19,9 +19,14 @@ namespace BirdFont { /** Kerning context. */ public class SpacingTab : KerningDisplay { +	double box_size = 122 * MainWindow.units; 	double height = 44 * MainWindow.units; 	double character_height = 20 * MainWindow.units;-		+	+	WidgetAllocation allocation;+	+	Glyph text_input_glyph;+	 	public SpacingTab () { 		adjust_side_bearings = true; 	}@@ -40,7 +45,6 @@ public class SpacingTab : KerningDisplay { 	} 	 	void draw_spacing_metrix (WidgetAllocation allocation, Context cr) {- 		GlyphSequence row; 		int index; @@ -78,10 +82,9 @@ public class SpacingTab : KerningDisplay { 		double end, middle; 		double l, r; 		Text left, right, cap;-		double box_size; 		unichar c; 		-		box_size = 122 * MainWindow.units;+		this.allocation = allocation; 		 		// end mark 		end = (index + 1) * box_size;@@ -156,6 +159,114 @@ public class SpacingTab : KerningDisplay { 		 		return s; 	}+	+	public override void button_press (uint button, double ex, double ey) {+		GlyphSequence row;+		double p;+		+		if (ey >= allocation.height - height) {+			// TODO: add button for processing ligatures+			row = get_first_row ().process_ligatures ();+			p = 0;+			foreach (Glyph? g in row.glyph) {+				if (p < ex < p + box_size / 2.0) {+					update_lsb(g);+				} ++				if (p + box_size / 2.0 < ex < p + box_size) {+					update_rsb(g);+				}+				+				p += box_size;+			}+		} else {+			base.button_press (button, ex, ey);+		}+	}+	+	public override void button_release (int button, double ex, double ey) {+		if (button == 3) {+			return;+		}+		+		if (!(ey >= allocation.height - height)) {+			base.button_release (button, ex, ey);+		}+	}+	+	void update_lsb (Glyph? g) {+		TextListener listener;+		string submitted_value = "";++		if (g == null) {+			return;+		}+		+		text_input_glyph = (!) g;+		listener = new TextListener (t_("Left"), @"$(text_input_glyph.get_left_side_bearing ())", t_("Set"));+		+		listener.signal_text_input.connect ((text) => {+			submitted_value = text;+			+			if (MenuTab.suppress_event) {+				return;+			}+			+			GlyphCanvas.redraw ();+		});+		+		listener.signal_submit.connect (() => {+			double v;+			MainWindow.native_window.hide_text_input ();+			+			text_input = false;+			suppress_input = false;+			+			v = double.parse (submitted_value);+			text_input_glyph.left_limit -= v - text_input_glyph.get_left_side_bearing ();+		});+		+		suppress_input = true;+		text_input = true;+		MainWindow.native_window.set_text_listener (listener);+	}+	+	void update_rsb (Glyph? g) {+		TextListener listener;+		string submitted_value = "";++		if (g == null) {+			return;+		}+		+		text_input_glyph = (!) g;+		listener = new TextListener (t_("Right"), @"$(text_input_glyph.get_right_side_bearing ())", t_("Set"));+		+		listener.signal_text_input.connect ((text) => {+			submitted_value = text;+			+			if (MenuTab.suppress_event) {+				return;+			}+			+			GlyphCanvas.redraw ();+		});+		+		listener.signal_submit.connect (() => {+			double v;+			MainWindow.native_window.hide_text_input ();+			+			text_input = false;+			suppress_input = false;+			+			v = double.parse (submitted_value);+			text_input_glyph.right_limit += v - text_input_glyph.get_right_side_bearing ();+		});+		+		suppress_input = true;+		text_input = true;+		MainWindow.native_window.set_text_listener (listener);+	} }  }