Adjust font size

Changed files (5)

• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/Expander.vala
• modified libbirdfont/FontName.vala
• modified libbirdfont/OverviewTool.vala
• modified libbirdfont/TabBar.vala

Diff

diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex d3127ee..64f8bce 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -93,13 +93,12 @@ public class DrawingTools : ToolCollection  { 		 		background_scale = new SpinButton (); 		-		draw_tools = new Expander ();+		draw_tools = new Expander (t_("Drawing Tools")); 		draw_tool_modifiers = new Expander (t_("Control Point Tools")); 		shape_tools = new Expander (t_("Geometrical Shapes")); 		 		Expander font_name = new Expander (); 		Expander key_tools = new Expander (); // tools on android-		Expander characterset_tools = new Expander (); 		Expander test_tools = new Expander (); 		Expander guideline_tools = new Expander (t_("Guidelines & Grid")); 		Expander view_tools = new Expander (t_("Zoom"));@@ -1094,8 +1093,6 @@ public class DrawingTools : ToolCollection  { 		} 		 		add_expander (draw_tool_modifiers);--		add_expander (characterset_tools); 		add_expander (guideline_tools); 		add_expander (grid); 		add_expander (view_tools);@@ -1115,9 +1112,6 @@ public class DrawingTools : ToolCollection  { 		 		draw_tool_modifiers.set_persistent (true); 		draw_tool_modifiers.set_unique (false);--		characterset_tools.set_persistent (true);-		characterset_tools.set_unique (true); 		 		test_tools.set_persistent (true); 	diff --git a/libbirdfont/Expander.vala b/libbirdfont/Expander.valaindex 30af660..1485b0f 100644--- a/libbirdfont/Expander.vala+++ b/libbirdfont/Expander.vala@@ -215,7 +215,7 @@ public class Expander : GLib.Object { 				title = new Text (); 				title.set_text ((!) headline); 				cr.set_source_rgba (101 / 255.0, 108 / 255.0, 116 / 255.0, 1);-				title.draw (cr, x, yt + HEADLINE_MARGIN, 8);+				title.draw (cr, x, yt + HEADLINE_MARGIN - 7, 14); 			} else if (draw_separator) {		 				cr.save (); 				cr.set_line_width (0.5);diff --git a/libbirdfont/FontName.vala b/libbirdfont/FontName.valaindex c39cb73..b7cfb67 100644--- a/libbirdfont/FontName.vala+++ b/libbirdfont/FontName.vala@@ -37,7 +37,7 @@ public class FontName : Tool { 		// tab label 		font_name = new Text (); 		font_name.set_text (BirdFont.get_current_font ().get_full_name ());-		text_height = 12;+		text_height = 22; 		 		max_width = (width - 2 * x * Toolbox.get_scale ()); 		extent = font_name.get_extent (text_height) * Toolbox.get_scale ();@@ -46,7 +46,7 @@ public class FontName : Tool { 		} 		 		cr.set_source_rgba (234 / 255.0, 77 / 255.0, 26 / 255.0, 1);-		font_name.draw (cr, x, y + 3, text_height);+		font_name.draw (cr, x, y - 10 / Toolbox.get_scale (), text_height); 		cr.restore (); 	} }diff --git a/libbirdfont/OverviewTool.vala b/libbirdfont/OverviewTool.valaindex bddff81..c4e90fd 100644--- a/libbirdfont/OverviewTool.vala+++ b/libbirdfont/OverviewTool.vala@@ -63,7 +63,7 @@ public class OverviewTool : Tool { 		cr.save (); 		font_name = new Text (); 		font_name.set_text (label);-		text_height = 10;+		text_height = 18;  		if (is_selected ()) { 			cr.set_source_rgba (1, 1, 1, 1);@@ -71,7 +71,7 @@ public class OverviewTool : Tool { 			cr.set_source_rgba (101 / 255.0, 108 / 255.0, 116 / 255.0, 1); 		} 		-		font_name.draw (cr, x + 14, y + 4, text_height);+		font_name.draw (cr, x + 14, y - 4.5, text_height); 		cr.restore ();  		// glyph count@@ -88,10 +88,10 @@ public class OverviewTool : Tool { 			 			glyph_count = new Text (); 			glyph_count.set_text (@"$(this.number)");-			text_height = 6 / scale;+			text_height = 12 / scale; 			 			center_x = bgx + ((!) counter_background).get_width () / 2.0  - glyph_count.get_extent (text_height) / 2.0;-			center_y = bgy + ((!) counter_background).get_height () / 2.0 - text_height / 2.0;+			center_y = bgy + ((!) counter_background).get_height () / 2.0 - text_height / 2.0 - 3 / scale;; 			 			if (is_selected ()) { 				cr.set_source_rgba (1, 1, 1, 1);diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex e2d74e2..31f6013 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -649,7 +649,6 @@ public class TabBar : GLib.Object { 		double tabs_end = width / scale; 		double h = height / scale; 		double tab_height;-		double tab_y; 		Tab t; 		Text label; 					@@ -665,7 +664,6 @@ public class TabBar : GLib.Object { 		} 		 		tab_height = this.height / scale;-		tab_y = h - tab_height; 		 		for (int tab_index = first_tab; tab_index < tabs.size; tab_index++) { 			t = tabs.get (tab_index);@@ -728,10 +726,10 @@ public class TabBar : GLib.Object { 			// tab label 			label = new Text (); 			label.set_text (t.get_label ());-			text_height = 8 / scale;+			text_height = 16 / scale; 			text_width = label.get_extent (text_height); 			center_x = tab_width / 2.0 - text_width / 2.0;-			center_y = h / 2.0 - text_height / 2;+			center_y = tab_height / 2.0 - 12 / scale; 			 			if (tab_index == selected) { 				cr.set_source_rgba (40 / 255.0, 57 / 255.0, 65 / 255.0, 1);