Merge lp:~michael-sheldon/jokosher/cairo_fix into lp:jokosher

[Michael Sheldon]

Fixes VU meters under Lucid

[lp:~michael-sheldon/jokosher/cairo_fix]

1106. By Michael Sheldon on 2010-05-22

Save the project's master volume

=== modified file 'Jokosher/Project.py'
--- Jokosher/Project.py	2010-03-31 22:06:22 +0000
+++ Jokosher/Project.py	2010-05-22 00:33:32 +0000
@@ -787,7 +787,7 @@
 		params = doc.createElement("Parameters")
 		head.appendChild(params)
 		
-		items = ["viewScale", "viewStart", "name", "author",
+		items = ["viewScale", "viewStart", "name", "author", "volume",
 		         "transportMode", "bpm", "meter_nom", "meter_denom", "projectfile"]
 		
 		Utils.StoreParametersToXML(self, doc, params, items)

=== modified file 'Jokosher/VUWidget.py'
--- Jokosher/VUWidget.py	2009-02-15 19:21:55 +0000
+++ Jokosher/VUWidget.py	2010-05-22 00:33:32 +0000
@@ -306,7 +306,7 @@
 		"""
 		
 		ctx = widget.window.cairo_create()
-		
+		ctx.save()
 		rect = self.get_allocation()
 
 		# Fill a black background		
@@ -320,9 +320,9 @@
 		ctx.set_source_surface(self.source, 0, 0)	
 		ctx.paint()
 
-		# Reset the clip region
-		ctx.reset_clip()
-		
+		# Restore the clipping region from saved context
+		ctx.restore()
+
 		# Draw the current volume level bar, with highlight if appropriate
 		vpos = self.__GetVolumeHandleYPos()
 		if self.fader_active: