version 0.4.0

Changed files (3)

• modified src/Glyph.vala
• modified src/GlyphCanvas.vala
• modified wscript

Diff

diff --git a/src/Glyph.vala b/src/Glyph.valaindex 564c5dd..c43e023 100644--- a/src/Glyph.vala+++ b/src/Glyph.vala@@ -1383,6 +1383,16 @@ class Glyph : FontDisplay { 		ImageSurface ps = new ImageSurface (Format.ARGB32, allocation.width, allocation.height); 		Context cmp = new Context (ps); +		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);+		}+		+		juxtapose (allocation, cr);+ 		if (Supplement.show_coordinates) { 			draw_coordinate (cmp); 		}@@ -1736,14 +1746,6 @@ class Glyph : FontDisplay { 		double x, kern; 		double left, baseline; 		string last_name;--		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/GlyphCanvas.vala b/src/GlyphCanvas.valaindex c65ffd9..61c720e 100644--- a/src/GlyphCanvas.vala+++ b/src/GlyphCanvas.vala@@ -73,10 +73,6 @@ class GlyphCanvas : DrawingArea  { 				Surface s = new Surface.similar (cw.get_target (), Cairo.Content.COLOR_ALPHA, allocation.width, allocation.height);
 				Context c = new Context (s); 
 
-				if (current_display is Glyph) {
-					((Glyph) current_display).juxtapose (allocation, c);
-				}
-						
 				current_display.draw (allocation, c);
 
 				cw.save ();
diff --git a/wscript b/wscriptindex 06f218e..f4b0185 100644--- a/wscript+++ b/wscript@@ -1,6 +1,6 @@ import time;
 
-VERSION = '0.3.1'
+VERSION = '0.4.0'
 APPNAME = 'birdfont'
 
 top = '.'