draw background before juxtaposing glyph

Changed files (4)

• modified src/ExportTool.vala
• modified src/Glyph.vala
• modified src/GlyphBackgroundImage.vala
• modified src/MenuTab.vala

Diff

diff --git a/src/ExportTool.vala b/src/ExportTool.valaindex b89cb90..87a9dc5 100644--- a/src/ExportTool.vala+++ b/src/ExportTool.vala@@ -540,7 +540,6 @@ os.put_string ( 		} 		 		void write_eof () {-			print ("WRITE EOF\n"); 			EotWriter fo;  			return_if_fail (!is_null (this));diff --git a/src/Glyph.vala b/src/Glyph.valaindex 10d9cbd..564c5dd 100644--- a/src/Glyph.vala+++ b/src/Glyph.vala@@ -1394,13 +1394,7 @@ class Glyph : FontDisplay { 			draw_help_lines (cmp); 			cmp.restore (); 		}--		if (background_image != null && background_image_visible) {-			cmp.save ();-			((!)background_image).draw (cr, allocation, view_offset_x, view_offset_y, view_zoom);-			cmp.restore ();-		}-		+				 		cmp.save ();  		tool = MainWindow.get_toolbox ().get_current_tool (); 		tool.draw_action (tool, cmp, this);@@ -1746,6 +1740,10 @@ class Glyph : FontDisplay { 		cr.save (); 		draw_background_color (cr, 1); 		cr.restore ();++		if (background_image != null && background_image_visible) {+			((!)background_image).draw (cr, allocation, view_offset_x, view_offset_y, view_zoom);+		} 				 		x = 0; 		diff --git a/src/GlyphBackgroundImage.vala b/src/GlyphBackgroundImage.valaindex 4f627b0..81e3673 100644--- a/src/GlyphBackgroundImage.vala+++ b/src/GlyphBackgroundImage.vala@@ -306,8 +306,6 @@ class GlyphBackgroundImage {  		x = Glyph.reverse_path_coordinate_x (img_offset_x); 		y = Glyph.reverse_path_coordinate_y (img_offset_y);-				-		cr.save (); 		 		ih = (int) get_img ().get_height (); 		iw = (int) get_img ().get_width ();diff --git a/src/MenuTab.vala b/src/MenuTab.valaindex 5466899..dbebae3 100644--- a/src/MenuTab.vala+++ b/src/MenuTab.vala@@ -239,7 +239,7 @@ c.append (""" 			select_overview (); 		}); 		-		MainWindow.get_tab_bar ().add_unique_tab (save, 50);+		MainWindow.get_tab_bar ().add_unique_tab (save, 70); 		 		if (!font.is_modified ()) { 			save.finished ();@@ -323,7 +323,7 @@ c.append (""" 			select_overview (); 		}); 		-		MainWindow.get_tab_bar ().add_unique_tab (save, 50);+		MainWindow.get_tab_bar ().add_unique_tab (save, 70); 		 		if (!font.is_modified ()) { 			save.finished ();@@ -335,7 +335,7 @@ c.append (""" 		save.finished.connect (() => { 			load_new_font (); 		});-		MainWindow.get_tab_bar ().add_unique_tab (save, 50);+		MainWindow.get_tab_bar ().add_unique_tab (save); 	}  	private static void load_new_font () {@@ -355,12 +355,12 @@ c.append (""" 	} 	 	public static void show_kerning_context () {-		MainWindow.get_tab_bar ().add_unique_tab (new ContextDisplay (), 65, false);+		MainWindow.get_tab_bar ().add_unique_tab (new ContextDisplay (), 85, false); 	} 	 	public static void preview () { 		TabBar t = MainWindow.get_tab_bar ();-		t.add_unique_tab (new Preview (), 64);		+		t.add_unique_tab (new Preview (), 80);		 	} } }