Merge lp:~ricotz/docky/pangolayout into lp:docky

[Rico Tzschichholz]

Use static Pango.Layouts to hopefully reduce memory leaks and get some more performance.

[lp:~ricotz/docky/pangolayout]

1654. By Rico Tzschichholz on 2010-10-08

fix leaking FontDescriptions

[Robert Dyer (psybers)]

In CalendarPainter, you dont need 3 layouts. Look where you create them, 2 are the same.

review: Needs Fixing

[Robert Dyer (psybers)]

In ADI, you can lift the FontDescription stuff for hover_layout

review: Needs Fixing

[Robert Dyer (psybers)]

Same thing in DockWindow

review: Needs Fixing

[Robert Dyer (psybers)]

You need to override Dispose *everywhere* and properly dispose the layouts and font descriptions, since they are now global in the class!

review: Needs Fixing

[lp:~ricotz/docky/pangolayout]

1655. By Rico Tzschichholz on 2010-12-29

merge trunk 1736

1656. By Rico Tzschichholz on 2011-01-02

fix build

1657. By Rico Tzschichholz on 2011-01-02

remove Width settings

1658. By Rico Tzschichholz on 2011-01-02

and more layout-stuff moved

1659. By Rico Tzschichholz on 2011-01-02

reset Width

1660. By Rico Tzschichholz on 2011-01-02

still one more

1661. By Rico Tzschichholz on 2011-01-02

merge trunk 1745

1662. By Rico Tzschichholz on 2011-01-03

fix leak

Unmerged revisions

1662. By Rico Tzschichholz on 2011-01-03

fix leak

1661. By Rico Tzschichholz on 2011-01-02

merge trunk 1745

1660. By Rico Tzschichholz on 2011-01-02

still one more

1659. By Rico Tzschichholz on 2011-01-02

reset Width

1658. By Rico Tzschichholz on 2011-01-02

and more layout-stuff moved

1657. By Rico Tzschichholz on 2011-01-02

remove Width settings

1656. By Rico Tzschichholz on 2011-01-02

fix build

1655. By Rico Tzschichholz on 2010-12-29

merge trunk 1736

1654. By Rico Tzschichholz on 2010-10-08

fix leaking FontDescriptions

1653. By Rico Tzschichholz on 2010-10-08

Use static Pango.Layouts instead of creating new one everytime

=== modified file 'Docky.Items/Docky.Items/AbstractDockItem.cs'
--- Docky.Items/Docky.Items/AbstractDockItem.cs	2010-12-28 16:43:48 +0000
+++ Docky.Items/Docky.Items/AbstractDockItem.cs	2011-01-03 11:34:09 +0000
@@ -44,6 +44,35 @@
 	
 	public abstract class AbstractDockItem : IDisposable
 	{
+		const int HoverTextFontSize = 11;
+
+		static Pango.Layout badge_layout;
+		static Pango.Layout hover_layout;
+		static Pango.Layout message_layout;
+		
+		static AbstractDockItem ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+			
+			badge_layout = DockServices.Drawing.ThemedPangoLayout ();
+			badge_layout.Ellipsize = Pango.EllipsizeMode.None;
+			badge_layout.FontDescription = style.FontDescription;
+			badge_layout.FontDescription.Weight = Pango.Weight.Bold;
+
+			hover_layout = DockServices.Drawing.ThemedPangoLayout ();
+			hover_layout.Ellipsize = Pango.EllipsizeMode.End;
+			hover_layout.FontDescription = style.FontDescription;
+			hover_layout.FontDescription.Weight = Pango.Weight.Bold;
+			hover_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (HoverTextFontSize);
+
+			message_layout = DockServices.Drawing.ThemedPangoLayout ();
+			message_layout.Ellipsize = Pango.EllipsizeMode.None;
+			message_layout.FontDescription = style.FontDescription;
+			message_layout.FontDescription.Weight = Pango.Weight.Normal;
+			
+			style.Dispose ();
+		}
+		
 		string hover_text, remote_text;
 		string badge_text, remote_badge_text;
 		bool[] redraw;
@@ -696,29 +725,20 @@
 				}
 			}
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ())
-			{
-				layout.Width = Pango.Units.FromPixels (surface.Width - iconSize - 8);
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.FontDescription = new Gtk.Style ().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Normal;
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) slotHeight - 6);
-				layout.SetText (message);
-				
-				Pango.Rectangle inkRect, logicalRect;
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				
-				surface.Context.MoveTo (surface.Width - 4 - logicalRect.Width, yOffset + (slotHeight - 2 - logicalRect.Height) / 2);
-				
-				Pango.CairoHelper.LayoutPath (surface.Context, layout);
-				surface.Context.LineWidth = 2;
-				surface.Context.StrokePreserve ();
-				surface.Context.Color = new Cairo.Color (1, 1, 1, 1);
-				surface.Context.Fill ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
-			}
+			message_layout.Width = Pango.Units.FromPixels (surface.Width - iconSize - 8);
+			message_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) slotHeight - 6);
+			message_layout.SetText (message);
+			
+			Pango.Rectangle inkRect, logicalRect;
+			message_layout.GetPixelExtents (out inkRect, out logicalRect);
+			
+			surface.Context.MoveTo (surface.Width - 4 - logicalRect.Width, yOffset + (slotHeight - 2 - logicalRect.Height) / 2);
+			
+			Pango.CairoHelper.LayoutPath (surface.Context, message_layout);
+			surface.Context.LineWidth = 2;
+			surface.Context.StrokePreserve ();
+			surface.Context.Color = new Cairo.Color (1, 1, 1, 1);
+			surface.Context.Fill ();
 		}
 		
 		void PaintProgressSurface (DockySurface surface)
@@ -862,47 +882,38 @@
 				padding = 2;
 			}
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ())
-			{
-				layout.Width = Pango.Units.FromPixels (surface.Height / 2);
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.FontDescription = new Gtk.Style ().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				
-				Pango.Rectangle inkRect, logicalRect;
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (surface.Height / 2);
-				layout.SetText (BadgeText);
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				
-				size -= 2 * padding + 2 * lineWidth;
-				
-				double scale = Math.Min (1, Math.Min (size / (double) logicalRect.Width, size / (double) logicalRect.Height));
-				
-				if (!IsSmall) {
-					surface.Context.Color = new Cairo.Color (0, 0, 0, 0.2);
-				} else {
-					surface.Context.Color = new Cairo.Color (0, 0, 0, 0.6);
-					x = surface.Width - scale * logicalRect.Width / 2;
-					y = scale * logicalRect.Height / 2;
-				}
-				
-				surface.Context.MoveTo (x - scale * logicalRect.Width / 2, y - scale * logicalRect.Height / 2);
-				
-				// draw text
-				surface.Context.Save ();
-				if (scale < 1)
-					surface.Context.Scale (scale, scale);
-				
-				surface.Context.LineWidth = 2;
-				Pango.CairoHelper.LayoutPath (surface.Context, layout);
-				surface.Context.StrokePreserve ();
-				surface.Context.Color = new Cairo.Color (1, 1, 1, 1);
-				surface.Context.Fill ();
-				surface.Context.Restore ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
+			badge_layout.Width = Pango.Units.FromPixels (surface.Height / 2);
+			
+			Pango.Rectangle inkRect, logicalRect;
+			badge_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (surface.Height / 2);
+			badge_layout.SetText (BadgeText);
+			badge_layout.GetPixelExtents (out inkRect, out logicalRect);
+			
+			size -= 2 * padding + 2 * lineWidth;
+			
+			double scale = Math.Min (1, Math.Min (size / (double) logicalRect.Width, size / (double) logicalRect.Height));
+			
+			if (!IsSmall) {
+				surface.Context.Color = new Cairo.Color (0, 0, 0, 0.2);
+			} else {
+				surface.Context.Color = new Cairo.Color (0, 0, 0, 0.6);
+				x = surface.Width - scale * logicalRect.Width / 2;
+				y = scale * logicalRect.Height / 2;
 			}
+			
+			surface.Context.MoveTo (x - scale * logicalRect.Width / 2, y - scale * logicalRect.Height / 2);
+			
+			// draw text
+			surface.Context.Save ();
+			if (scale < 1)
+				surface.Context.Scale (scale, scale);
+			
+			surface.Context.LineWidth = 2;
+			Pango.CairoHelper.LayoutPath (surface.Context, badge_layout);
+			surface.Context.StrokePreserve ();
+			surface.Context.Color = new Cairo.Color (1, 1, 1, 1);
+			surface.Context.Fill ();
+			surface.Context.Restore ();
 		}
 		
 		/// <summary>
@@ -923,35 +934,26 @@
 				return null;
 			
 			if (text_buffer == null) {
-				using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-					layout.FontDescription = style.FontDescription;
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (11);
-					layout.FontDescription.Weight = Pango.Weight.Bold;
-					layout.Ellipsize = Pango.EllipsizeMode.End;
-					
-					layout.SetText (HoverText);
-					
-					Pango.Rectangle inkRect, logicalRect;
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					if (logicalRect.Width > 0.8 * Gdk.Screen.Default.Width) {
-						layout.Width = Pango.Units.FromPixels ((int) (0.8 * Gdk.Screen.Default.Width));
-						layout.GetPixelExtents (out inkRect, out logicalRect);
-					}
-					
-					int textWidth = logicalRect.Width;
-					int textHeight = logicalRect.Height;
-					int buffer = HoverTextHeight - textHeight;
-					text_buffer = new DockySurface (Math.Max (HoverTextHeight, textWidth + buffer), HoverTextHeight, model);
-					
-					Cairo.Context cr = text_buffer.Context;
-					
-					cr.MoveTo (buffer / 2, buffer / 2);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Color = isLight ? new Cairo.Color (0.1, 0.1, 0.1) : new Cairo.Color (1, 1, 1);
-					cr.Fill ();
-					
-					layout.Context.Dispose ();
+				hover_layout.SetText (HoverText);
+				
+				Pango.Rectangle inkRect, logicalRect;
+				hover_layout.GetPixelExtents (out inkRect, out logicalRect);
+				if (logicalRect.Width > 0.8 * Gdk.Screen.Default.Width) {
+					hover_layout.Width = Pango.Units.FromPixels ((int) (0.8 * Gdk.Screen.Default.Width));
+					hover_layout.GetPixelExtents (out inkRect, out logicalRect);
 				}
+				
+				int textWidth = inkRect.Width;
+				int textHeight = logicalRect.Height;
+				int buffer = HoverTextHeight - textHeight;
+				text_buffer = new DockySurface (Math.Max (HoverTextHeight, textWidth + buffer), HoverTextHeight, model);
+				
+				Cairo.Context cr = text_buffer.Context;
+				
+				cr.MoveTo ((text_buffer.Width - textWidth) / 2, buffer / 2);
+				Pango.CairoHelper.LayoutPath (cr, hover_layout);
+				cr.Color = isLight ? new Cairo.Color (0.1, 0.1, 0.1) : new Cairo.Color (1, 1, 1);
+				cr.Fill ();
 			}
 			
 			return text_buffer;
 
=== modified file 'Docky.Items/Docky.Items/IconEmblem.cs'
--- Docky.Items/Docky.Items/IconEmblem.cs	2010-06-25 13:06:51 +0000
+++ Docky.Items/Docky.Items/IconEmblem.cs	2011-01-03 11:34:09 +0000
@@ -97,6 +97,7 @@
 				return;
 			}
 			ForcePixbuf = info.LoadIcon ();
+			info.Dispose ();
 		}
 		
 		public Pixbuf GetPixbuf (int parentWidth, int parentHeight) {
 
=== modified file 'Docky/Docky/Interface/DockWindow.cs'
--- Docky/Docky/Interface/DockWindow.cs	2010-11-22 08:46:18 +0000
+++ Docky/Docky/Interface/DockWindow.cs	2011-01-03 11:34:09 +0000
@@ -135,7 +135,9 @@
 		const int NormalIndicatorSize = 20;
 		const int UrgentIndicatorSize = 26;
 		const int GlowSize = 30;
-		
+		const int HoverTextHeight = 26;
+		const int HoverTextFontSize = 11;
+
 		const int WaitGroups = 3;
 		const int WaitArmsPerGroup = 8;
 		
@@ -338,31 +340,20 @@
 		
 		DockySurface DrawHoverText (DockySurface surface, string text)
 		{
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				layout.FontDescription = Style.FontDescription;
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (11);
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.End;
-				layout.Width = Pango.Units.FromPixels (500);
-				
-				layout.SetText (text);
-				
-				Pango.Rectangle inkRect, logicalRect;
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				
-				const int HoverTextHeight = 26;
-				int textWidth = inkRect.Width;
-				int textHeight = logicalRect.Height;
-				int buffer = HoverTextHeight - textHeight;
-				surface = new DockySurface (Math.Max (HoverTextHeight, textWidth + buffer), HoverTextHeight, background_buffer);
-				
-				surface.Context.MoveTo ((surface.Width - textWidth) / 2, buffer / 2);
-				Pango.CairoHelper.LayoutPath (surface.Context, layout);
-				surface.Context.Color = HoverTextManager.IsLight ? new Cairo.Color (0.1, 0.1, 0.1) : new Cairo.Color (1, 1, 1);
-				surface.Context.Fill ();
-				
-				layout.Context.Dispose ();
-			}
+			hover_layout.SetText (text);
+			
+			Pango.Rectangle inkRect, logicalRect;
+			hover_layout.GetPixelExtents (out inkRect, out logicalRect);
+			
+			int textWidth = inkRect.Width;
+			int textHeight = logicalRect.Height;
+			int buffer = HoverTextHeight - textHeight;
+			surface = new DockySurface (Math.Max (HoverTextHeight, textWidth + buffer), HoverTextHeight, background_buffer);
+				
+			surface.Context.MoveTo ((surface.Width - textWidth) / 2, buffer / 2);
+			Pango.CairoHelper.LayoutPath (surface.Context, hover_layout);
+			surface.Context.Color = HoverTextManager.IsLight ? new Cairo.Color (0.1, 0.1, 0.1) : new Cairo.Color (1, 1, 1);
+			surface.Context.Fill ();
 			
 			return surface;
 		}
@@ -676,9 +667,21 @@
 
 		#endregion
 		
+		static Pango.Layout hover_layout;
+		
 		static DockWindow ()
 		{
 			DockyItem = new DockyItem ();
+			
+			Gtk.Style style = new Gtk.Style ();
+			
+			hover_layout = DockServices.Drawing.ThemedPangoLayout ();
+			hover_layout.Ellipsize = Pango.EllipsizeMode.End;
+			hover_layout.FontDescription = style.FontDescription;
+			hover_layout.FontDescription.Weight = Pango.Weight.Bold;
+			hover_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (HoverTextFontSize);
+			
+			style.Dispose ();
 		}
 	
 		public DockWindow () : base(Gtk.WindowType.Toplevel)
 
=== modified file 'Docky/Docky/Menus/MenuItemWidget.cs'
--- Docky/Docky/Menus/MenuItemWidget.cs	2010-11-14 14:17:17 +0000
+++ Docky/Docky/Menus/MenuItemWidget.cs	2011-01-03 11:34:09 +0000
@@ -63,6 +63,21 @@
 		
 		DockySurface icon_surface, emblem_surface;
 		
+		static Pango.Layout layout;
+		
+		static MenuItemWidget ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+
+			layout = DockServices.Drawing.ThemedPangoLayout ();
+			layout.Ellipsize = Pango.EllipsizeMode.End;
+			layout.FontDescription = style.FontDescription;
+			layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
+			layout.FontDescription.Weight = Pango.Weight.Bold;
+			
+			style.Dispose ();
+		}
+		
 		internal MenuItemWidget (MenuItem item) : base()
 		{
 			TextColor = new Cairo.Color (1, 1, 1);
@@ -91,26 +106,19 @@
 		
 		void CalcTextWidth ()
 		{
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				char accel;
-				
-				if (item.Mnemonic.HasValue)
-					layout.SetMarkupWithAccel (item.Text, '_', out accel);
-				else
-					layout.SetMarkup (item.Text);
-				layout.FontDescription = Style.FontDescription;
-				layout.Ellipsize = Pango.EllipsizeMode.End;
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				
-				Pango.Rectangle logical, ink;
-				layout.GetPixelExtents (out ink, out logical);
-				
-				TextWidth = Math.Min (MaxWidth, Math.Max (MinWidth, logical.Width));
-				HasTooltip = TextWidth < logical.Width;
-				
-				layout.Context.Dispose ();
-			}
+			char accel;
+			
+			if (item.Mnemonic.HasValue)
+				layout.SetMarkupWithAccel (item.Text, '_', out accel);
+			else
+				layout.SetMarkup (item.Text);
+			
+			layout.Width = -1;
+			Pango.Rectangle logical, ink;
+			layout.GetPixelExtents (out ink, out logical);
+			
+			TextWidth = Math.Min (MaxWidth, Math.Max (MinWidth, logical.Width));
+			HasTooltip = TextWidth < logical.Width;
 			
 			SetSize ();
 		}
@@ -265,31 +273,23 @@
 					}
 				}
 			
-				using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-					char accel;
-					if (item.Mnemonic.HasValue)
-						layout.SetMarkupWithAccel (item.Text, '_', out accel);
-					else
-						layout.SetMarkup (item.Text);
-					layout.Width = Pango.Units.FromPixels (TextWidth);
-					layout.FontDescription = Style.FontDescription;
-					layout.Ellipsize = Pango.EllipsizeMode.End;
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
-					layout.FontDescription.Weight = Pango.Weight.Bold;
-					
-					Pango.Rectangle logical, ink;
-					layout.GetPixelExtents (out ink, out logical);
-					
-					int offset = Padding;
-					if (MenuShowingIcons)
-						offset += MenuHeight + Padding;
-					cr.MoveTo (allocation.X + offset, allocation.Y + (allocation.Height - logical.Height) / 2);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Color = TextColor.SetAlpha (item.Disabled ? 0.5 : 1);
-					cr.Fill ();
-					
-					layout.Context.Dispose ();
-				}
+				char accel;
+				if (item.Mnemonic.HasValue)
+					layout.SetMarkupWithAccel (item.Text, '_', out accel);
+				else
+					layout.SetMarkup (item.Text);
+				layout.Width = Pango.Units.FromPixels (TextWidth);
+				
+				Pango.Rectangle logical, ink;
+				layout.GetPixelExtents (out ink, out logical);
+				
+				int offset = Padding;
+				if (MenuShowingIcons)
+					offset += MenuHeight + Padding;
+				cr.MoveTo (allocation.X + offset, allocation.Y + (allocation.Height - logical.Height) / 2);
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Color = TextColor.SetAlpha (item.Disabled ? 0.5 : 1);
+				cr.Fill ();
 				
 				(cr.Target as IDisposable).Dispose ();
 			}
 
=== modified file 'Docky/Docky/Menus/SeparatorWidget.cs'
--- Docky/Docky/Menus/SeparatorWidget.cs	2010-10-15 15:32:36 +0000
+++ Docky/Docky/Menus/SeparatorWidget.cs	2011-01-03 11:34:09 +0000
@@ -28,12 +28,29 @@
 {
 	public class SeparatorWidget : EventBox
 	{
+		const int FontSize = 8;
+
 		string title;
 		
 		public Cairo.Color TextColor { get; set; }
 		
 		public bool DrawLine { get; set; }
 		
+		static Pango.Layout layout;
+		
+		static SeparatorWidget ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+
+			layout = DockServices.Drawing.ThemedPangoLayout ();
+			layout.Ellipsize = Pango.EllipsizeMode.End;
+			layout.FontDescription = style.FontDescription;
+			layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
+			layout.FontDescription.Weight = Pango.Weight.Bold;
+			
+			style.Dispose ();
+		}
+		
 		public SeparatorWidget (string title)
 		{
 			this.title = title;
@@ -63,27 +80,20 @@
 				int xMiddle = x + width / 2;
 				double yMiddle = Allocation.Y + Allocation.Height / 2.0;
 				
-				if (!string.IsNullOrEmpty (title))
-					using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-						layout.SetText (title);
-						layout.Width = Pango.Units.FromPixels (Allocation.Width - Allocation.Height);
-						layout.FontDescription = Style.FontDescription;
-						layout.Ellipsize = Pango.EllipsizeMode.End;
-						layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (8);
-						layout.FontDescription.Weight = Pango.Weight.Bold;
-						
-						Pango.Rectangle logical, ink;
-						layout.GetPixelExtents (out ink, out logical);
-						
-						cr.MoveTo (Allocation.X + 2, Allocation.Y + (Allocation.Height - logical.Height) / 2);
-						Pango.CairoHelper.LayoutPath (cr, layout);
-						cr.Color = TextColor.SetAlpha (.6);
-						cr.Fill ();
-						
-						x += logical.Width + 5;
-						
-						layout.Context.Dispose ();
-					}
+				if (!string.IsNullOrEmpty (title)) {
+					layout.SetText (title);
+					layout.Width = Pango.Units.FromPixels (Allocation.Width - Allocation.Height);
+					
+					Pango.Rectangle logical, ink;
+					layout.GetPixelExtents (out ink, out logical);
+					
+					cr.MoveTo (Allocation.X + 2, Allocation.Y + (Allocation.Height - logical.Height) / 2);
+					Pango.CairoHelper.LayoutPath (cr, layout);
+					cr.Color = TextColor.SetAlpha (.6);
+					cr.Fill ();
+					
+					x += logical.Width + 5;
+				}
 				
 				if (DrawLine) {
 					cr.MoveTo (x, yMiddle);
 
=== modified file 'StandardPlugins/Clock/src/CalendarPainter.cs'
--- StandardPlugins/Clock/src/CalendarPainter.cs	2010-07-15 07:44:12 +0000
+++ StandardPlugins/Clock/src/CalendarPainter.cs	2011-01-03 11:34:09 +0000
@@ -42,6 +42,31 @@
 			}
 		}
 		
+		static Pango.Layout header_layout;
+		static Pango.Layout line_layout;
+		static Pango.Layout month_layout;
+			
+		static CalendarPainter ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+
+			header_layout = DockServices.Drawing.ThemedPangoLayout ();
+			header_layout.FontDescription = style.FontDescription;
+			header_layout.FontDescription.Weight = Pango.Weight.Bold;
+			header_layout.Ellipsize = Pango.EllipsizeMode.None;
+
+			line_layout = DockServices.Drawing.ThemedPangoLayout ();
+			line_layout.FontDescription = style.FontDescription;
+			line_layout.Ellipsize = Pango.EllipsizeMode.None;
+			
+			month_layout = DockServices.Drawing.ThemedPangoLayout ();
+			month_layout.FontDescription = style.FontDescription;
+			month_layout.FontDescription.Weight = Pango.Weight.Bold;
+			month_layout.Ellipsize = Pango.EllipsizeMode.None;
+			
+			style.Dispose ();
+		}
+		
 		public CalendarPainter () : base (3)
 		{
 			StartDate = DateTime.Today.AddDays (1 - DateTime.Today.Day);
@@ -106,33 +131,25 @@
 		{
 			string month = StartDate.ToString ("MMMM").ToUpper ();
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (Allocation.Height);
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (Allocation.Height / 6);
-				
-				cr.Save ();
-				cr.Color = new Cairo.Color (1, 1, 1, .5);
-				layout.SetText (month);
-				
-				Pango.Rectangle inkRect, logicalRect;
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				double scale = Math.Min (1, Math.Min (Allocation.Height / (double) inkRect.Width, (Allocation.Width / 9.0) / (double) logicalRect.Height));
-				
-				cr.Rotate (Math.PI / -2.0);
-				cr.MoveTo ((Allocation.Height - scale * inkRect.Width) / 2 - Allocation.Height, Allocation.Width / 9 - scale * logicalRect.Height);
-				if (scale < 1)
-					cr.Scale (scale, scale);
-				
-				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.Fill ();
-				cr.Restore ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
-			}
+			month_layout.Width = Pango.Units.FromPixels (Allocation.Height);
+			month_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (Allocation.Height / 6);
+			
+			cr.Save ();
+			cr.Color = new Cairo.Color (1, 1, 1, .5);
+			month_layout.SetText (month);
+			
+			Pango.Rectangle inkRect, logicalRect;
+			month_layout.GetPixelExtents (out inkRect, out logicalRect);
+			double scale = Math.Min (1, Math.Min (Allocation.Height / (double) inkRect.Width, (Allocation.Width / 9.0) / (double) logicalRect.Height));
+			
+			cr.Rotate (Math.PI / -2.0);
+			cr.MoveTo ((Allocation.Height - scale * inkRect.Width) / 2 - Allocation.Height, Allocation.Width / 9 - scale * logicalRect.Height);
+			if (scale < 1)
+				cr.Scale (scale, scale);
+			
+			Pango.CairoHelper.LayoutPath (cr, month_layout);
+			cr.Fill ();
+			cr.Restore ();
 		}
 		
 		void RenderHeader (Context cr, DateTime start)
@@ -142,28 +159,20 @@
 			
 			DateTime day = CalendarStartDate;
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (offsetSize);
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (0.625 * LineHeight));
-				
-				cr.Color = new Cairo.Color (1, 1, 1, .5);
-				for (int i = 0; i < 7; i++) {
-					layout.SetText (day.ToString ("ddd").ToUpper ());
-					
-					Pango.Rectangle inkRect, logicalRect;
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (offsetSize + offsetSize * i + (offsetSize - inkRect.Width) / 2, centerLine - logicalRect.Height);
-					
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
-					day = day.AddDays (1);
-				}
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
+			header_layout.Width = Pango.Units.FromPixels (offsetSize);
+			header_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (0.625 * LineHeight));
+			
+			cr.Color = new Cairo.Color (1, 1, 1, .5);
+			for (int i = 0; i < 7; i++) {
+				header_layout.SetText (day.ToString ("ddd").ToUpper ());
+				
+				Pango.Rectangle inkRect, logicalRect;
+				header_layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (offsetSize + offsetSize * i + (offsetSize - inkRect.Width) / 2, centerLine - logicalRect.Height);
+				
+				Pango.CairoHelper.LayoutPath (cr, header_layout);
+				cr.Fill ();
+				day = day.AddDays (1);
 			}
 		}
 		
@@ -174,58 +183,51 @@
 			int centerLine = LineHeight + LineHeight * line + ((Allocation.Height % LineHeight) / 2);
 			int dayOffset = 0;
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				Pango.Rectangle inkRect, logicalRect;
-				
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (offsetSize);
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (0.625 * LineHeight));
-				
-				for (int i = 0; i < 7; i++) {
-					layout.FontDescription.Weight = Pango.Weight.Normal;
-					
-					DateTime day = lineStart.AddDays (dayOffset);
-					
-					if (day.Month == CalendarStartDate.AddDays (6).Month)
-						cr.Color = new Cairo.Color (1, 1, 1);
-					else
-						cr.Color = new Cairo.Color (1, 1, 1, 0.5);
-					
-					if (day.Date == DateTime.Today)
-					{
-						layout.FontDescription.Weight = Pango.Weight.Bold;
-						Gdk.Color color = Style.Backgrounds [(int) StateType.Selected].SetMinimumValue (100);
-						cr.Color = new Cairo.Color ((double) color.Red / ushort.MaxValue,
-													(double) color.Green / ushort.MaxValue,
-													(double) color.Blue / ushort.MaxValue,
-													1.0);
-					}
-					dayOffset++;
-					
-					layout.SetText (string.Format ("{0:00}", day.Day));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (offsetSize + offsetSize * i + (offsetSize - inkRect.Width) / 2, centerLine - logicalRect.Height);
-					
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
+			Pango.Rectangle inkRect, logicalRect;
+			
+			line_layout.Width = Pango.Units.FromPixels (offsetSize);
+			line_layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (0.625 * LineHeight));
+			
+			for (int i = 0; i < 7; i++) {
+				line_layout.FontDescription.Weight = Pango.Weight.Normal;
+				
+				DateTime day = lineStart.AddDays (dayOffset);
+				
+				if (day.Month == CalendarStartDate.AddDays (6).Month)
+					cr.Color = new Cairo.Color (1, 1, 1);
+				else
+					cr.Color = new Cairo.Color (1, 1, 1, 0.5);
+				
+				if (day.Date == DateTime.Today)
+				{
+					line_layout.FontDescription.Weight = Pango.Weight.Bold;
+					Gdk.Color color = Style.Backgrounds [(int) StateType.Selected].SetMinimumValue (100);
+					cr.Color = new Cairo.Color ((double) color.Red / ushort.MaxValue,
+					                            (double) color.Green / ushort.MaxValue,
+					                            (double) color.Blue / ushort.MaxValue,
+					                            1.0);
 				}
-				
-				cr.Color = new Cairo.Color (1, 1, 1, 0.4);
-				int woy = CultureInfo.CurrentCulture.Calendar.GetWeekOfYear (lineStart.AddDays (6), 
-																			 DateTimeFormatInfo.CurrentInfo.CalendarWeekRule, 
-																			 DateTimeFormatInfo.CurrentInfo.FirstDayOfWeek);
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.SetText (string.Format ("W{0:00}", woy));
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				cr.MoveTo (offsetSize * 8, centerLine - logicalRect.Height);
-				
-				Pango.CairoHelper.LayoutPath (cr, layout);
+				dayOffset++;
+				
+				line_layout.SetText (string.Format ("{0:00}", day.Day));
+				line_layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (offsetSize + offsetSize * i + (offsetSize - inkRect.Width) / 2, centerLine - logicalRect.Height);
+				
+				Pango.CairoHelper.LayoutPath (cr, line_layout);
 				cr.Fill ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
 			}
+			
+			cr.Color = new Cairo.Color (1, 1, 1, 0.4);
+			int woy = CultureInfo.CurrentCulture.Calendar.GetWeekOfYear (lineStart.AddDays (6), 
+			                                                             DateTimeFormatInfo.CurrentInfo.CalendarWeekRule, 
+			                                                             DateTimeFormatInfo.CurrentInfo.FirstDayOfWeek);
+			line_layout.FontDescription.Weight = Pango.Weight.Bold;
+			line_layout.SetText (string.Format ("W{0:00}", woy));
+			line_layout.GetPixelExtents (out inkRect, out logicalRect);
+			cr.MoveTo (offsetSize * 8, centerLine - logicalRect.Height);
+			
+			Pango.CairoHelper.LayoutPath (cr, line_layout);
+			cr.Fill ();
 		}
 		
 		protected override void OnShown ()
 
=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs'
--- StandardPlugins/Clock/src/ClockDockItem.cs	2010-11-21 22:19:54 +0000
+++ StandardPlugins/Clock/src/ClockDockItem.cs	2011-01-03 11:34:09 +0000
@@ -141,6 +141,20 @@
 			}
 		}
 		
+		static Pango.Layout layout;
+		
+		static ClockDockItem ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+
+			layout = DockServices.Drawing.ThemedPangoLayout ();
+			layout.FontDescription = style.FontDescription;
+			layout.FontDescription.Weight = Pango.Weight.Bold;
+			layout.Ellipsize = Pango.EllipsizeMode.None;
+			
+			style.Dispose ();
+		}
+
 		public ClockDockItem ()
 		{
 			ScalableRendering = !ShowDigital;
@@ -215,78 +229,69 @@
 			int center = surface.Height / 2;
 			
 			// shared by all text
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (surface.Width);
-				
-				
-				// draw the time, outlined
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (timeSize);
-				
-				if (ShowMilitary)
-					layout.SetText (DateTime.Now.ToString ("HH:mm"));
-				else
-					layout.SetText (DateTime.Now.ToString ("h:mm"));
-				
-				Pango.Rectangle inkRect, logicalRect;
+			layout.Width = Pango.Units.FromPixels (surface.Width);
+			
+			// draw the time, outlined
+			layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (timeSize);
+			
+			if (ShowMilitary)
+				layout.SetText (DateTime.Now.ToString ("HH:mm"));
+			else
+				layout.SetText (DateTime.Now.ToString ("h:mm"));
+			
+			Pango.Rectangle inkRect, logicalRect;
+			layout.GetPixelExtents (out inkRect, out logicalRect);
+			
+			int timeYOffset = ShowMilitary ? timeSize : timeSize / 2;
+			int timeXOffset = (surface.Width - inkRect.Width) / 2;
+			if (ShowDate)
+				cr.MoveTo (timeXOffset, timeYOffset);
+			else
+				cr.MoveTo (timeXOffset, timeYOffset + timeSize / 2);
+			
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.LineWidth = 3;
+			cr.Color = new Cairo.Color (0, 0, 0, 0.5);
+			cr.StrokePreserve ();
+			cr.Color = new Cairo.Color (1, 1, 1, 0.8);
+			cr.Fill ();
+			
+			// draw the date, outlined
+			if (ShowDate) {
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (dateSize);
+				
+				layout.SetText (DateTime.Now.ToString ("MMM dd"));
 				layout.GetPixelExtents (out inkRect, out logicalRect);
-				
-				int timeYOffset = ShowMilitary ? timeSize : timeSize / 2;
-				int timeXOffset = (surface.Width - inkRect.Width) / 2;
-				if (ShowDate)
-					cr.MoveTo (timeXOffset, timeYOffset);
-				else
-					cr.MoveTo (timeXOffset, timeYOffset + timeSize / 2);
+				cr.MoveTo ((surface.Width - inkRect.Width) / 2, surface.Height - spacing - dateSize);
 				
 				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.LineWidth = 3;
+				cr.LineWidth = 2.5;
 				cr.Color = new Cairo.Color (0, 0, 0, 0.5);
 				cr.StrokePreserve ();
 				cr.Color = new Cairo.Color (1, 1, 1, 0.8);
 				cr.Fill ();
-				
-				// draw the date, outlined
-				if (ShowDate) {
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (dateSize);
-					
-					layout.SetText (DateTime.Now.ToString ("MMM dd"));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo ((surface.Width - inkRect.Width) / 2, surface.Height - spacing - dateSize);
-					
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.LineWidth = 2.5;
-					cr.Color = new Cairo.Color (0, 0, 0, 0.5);
-					cr.StrokePreserve ();
-					cr.Color = new Cairo.Color (1, 1, 1, 0.8);
-					cr.Fill ();
-				}
-				
-				if (!ShowMilitary) {
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (ampmSize);
-					
-					int yOffset = ShowDate ? center - spacing : surface.Height - spacing - ampmSize;
-					
-					// draw AM indicator
-					layout.SetText ("am");
-					cr.Color = new Cairo.Color (1, 1, 1, DateTime.Now.Hour < 12 ? 0.8 : 0.2);
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo ((center - inkRect.Width) / 2, yOffset);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
-					
-					// draw PM indicator
-					layout.SetText ("pm");
-					cr.Color = new Cairo.Color (1, 1, 1, DateTime.Now.Hour > 11 ? 0.8 : 0.2);
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (center + (center - inkRect.Width) / 2, yOffset);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
-				}
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
+			}
+			
+			if (!ShowMilitary) {
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (ampmSize);
+				
+				int yOffset = ShowDate ? center - spacing : surface.Height - spacing - ampmSize;
+				
+				// draw AM indicator
+				layout.SetText ("am");
+				cr.Color = new Cairo.Color (1, 1, 1, DateTime.Now.Hour < 12 ? 0.8 : 0.2);
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo ((center - inkRect.Width) / 2, yOffset);
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Fill ();
+				
+				// draw PM indicator
+				layout.SetText ("pm");
+				cr.Color = new Cairo.Color (1, 1, 1, DateTime.Now.Hour > 11 ? 0.8 : 0.2);
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (center + (center - inkRect.Width) / 2, yOffset);
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Fill ();
 			}
 		}
 		
@@ -301,72 +306,63 @@
 			int spacing = timeSize / 2;
 			
 			// shared by all text
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (surface.Width);
-				
-				
-				// draw the time, outlined
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (timeSize);
-				
-				if (ShowMilitary)
-					layout.SetText (DateTime.Now.ToString ("HH:mm"));
+			layout.Width = Pango.Units.FromPixels (surface.Width);
+			
+			// draw the time, outlined
+			layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (timeSize);
+			
+			if (ShowMilitary)
+				layout.SetText (DateTime.Now.ToString ("HH:mm"));
+			else
+				layout.SetText (DateTime.Now.ToString ("h:mm"));
+			
+			Pango.Rectangle inkRect, logicalRect;
+			layout.GetPixelExtents (out inkRect, out logicalRect);
+			
+			int timeYOffset = timeSize / 2;
+			if (!ShowDate)
+				timeYOffset += timeSize / 2;
+			cr.MoveTo ((surface.Width - inkRect.Width) / 2, timeYOffset);
+			
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.LineWidth = 2;
+			cr.Color = new Cairo.Color (0, 0, 0, 0.5);
+			cr.StrokePreserve ();
+			cr.Color = new Cairo.Color (1, 1, 1, 0.8);
+			cr.Fill ();
+			
+			// draw the date, outlined
+			if (ShowDate) {
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (dateSize);
+				
+				layout.SetText (DateTime.Now.ToString ("MMM dd"));
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo ((surface.Width - inkRect.Width) / 2, surface.Height - spacing - dateSize);
+				
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Color = new Cairo.Color (0, 0, 0, 0.5);
+				cr.StrokePreserve ();
+				cr.Color = new Cairo.Color (1, 1, 1, 0.8);
+				cr.Fill ();
+			}
+			
+			if (!ShowMilitary) {
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (ampmSize);
+				
+				if (DateTime.Now.Hour < 12)
+					layout.SetText ("am");
 				else
-					layout.SetText (DateTime.Now.ToString ("h:mm"));
+					layout.SetText ("pm");
 				
-				Pango.Rectangle inkRect, logicalRect;
 				layout.GetPixelExtents (out inkRect, out logicalRect);
-				
-				int timeYOffset = timeSize / 2;
+				int yOffset = timeSize;
 				if (!ShowDate)
-					timeYOffset += timeSize / 2;
-				cr.MoveTo ((surface.Width - inkRect.Width) / 2, timeYOffset);
+					yOffset += timeSize / 2;
+				cr.MoveTo (surface.Width - logicalRect.Width, yOffset - inkRect.Height);
 				
 				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.LineWidth = 2;
-				cr.Color = new Cairo.Color (0, 0, 0, 0.5);
-				cr.StrokePreserve ();
 				cr.Color = new Cairo.Color (1, 1, 1, 0.8);
 				cr.Fill ();
-				
-				// draw the date, outlined
-				if (ShowDate) {
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (dateSize);
-					
-					layout.SetText (DateTime.Now.ToString ("MMM dd"));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo ((surface.Width - inkRect.Width) / 2, surface.Height - spacing - dateSize);
-					
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Color = new Cairo.Color (0, 0, 0, 0.5);
-					cr.StrokePreserve ();
-					cr.Color = new Cairo.Color (1, 1, 1, 0.8);
-					cr.Fill ();
-				}
-				
-				if (!ShowMilitary) {
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (ampmSize);
-					
-					if (DateTime.Now.Hour < 12)
-						layout.SetText ("am");
-					else
-						layout.SetText ("pm");
-					
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					int yOffset = timeSize;
-					if (!ShowDate)
-						yOffset += timeSize / 2;
-					cr.MoveTo (surface.Width - logicalRect.Width, yOffset - inkRect.Height);
-					
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Color = new Cairo.Color (1, 1, 1, 0.8);
-					cr.Fill ();
-				}
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
 			}
 		}
 		
 
=== modified file 'StandardPlugins/Weather/src/WeatherDocklet.cs'
--- StandardPlugins/Weather/src/WeatherDocklet.cs	2010-11-21 22:19:54 +0000
+++ StandardPlugins/Weather/src/WeatherDocklet.cs	2011-01-03 11:34:09 +0000
@@ -62,6 +62,20 @@
 		
 		ConfigDialog Config;
 		
+		static Pango.Layout layout;
+		
+		static WeatherDocklet ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+			
+			layout = DockServices.Drawing.ThemedPangoLayout ();
+			layout.FontDescription = style.FontDescription;
+			layout.FontDescription.Weight = Pango.Weight.Bold;
+			layout.Ellipsize = Pango.EllipsizeMode.None;
+			
+			style.Dispose ();
+		}
+		
 		/// <summary>
 		/// Creates a new weather docklet.
 		/// </summary>
@@ -154,35 +168,25 @@
 			int size = Math.Min (surface.Width, surface.Height);
 			Context cr = surface.Context;
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ())
-			{
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				
-				Pango.Rectangle inkRect, logicalRect;
-				
-				layout.Width = Pango.Units.FromPixels (size);
-				layout.SetText (WeatherController.Weather.Temp + AbstractWeatherSource.TempUnit);
-				if (IsSmall)
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (size / 2.5));
-				else
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (size / 3.5));
-				
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				cr.MoveTo ((size - inkRect.Width) / 2, size - logicalRect.Height);
-				
-				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.LineWidth = 2;
-				cr.Color = new Cairo.Color (0, 0, 0, 0.8);
-				cr.StrokePreserve ();
-				
-				cr.Color = new Cairo.Color (1, 1, 1, 0.8);
-				cr.Fill ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();				
-			}
+			Pango.Rectangle inkRect, logicalRect;
+			
+			layout.Width = Pango.Units.FromPixels (size);
+			layout.SetText (WeatherController.Weather.Temp + AbstractWeatherSource.TempUnit);
+			if (IsSmall)
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (size / 2.5));
+			else
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (size / 3.5));
+			
+			layout.GetPixelExtents (out inkRect, out logicalRect);
+			cr.MoveTo ((size - inkRect.Width) / 2, size - logicalRect.Height);
+			
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.LineWidth = 2;
+			cr.Color = new Cairo.Color (0, 0, 0, 0.8);
+			cr.StrokePreserve ();
+			
+			cr.Color = new Cairo.Color (1, 1, 1, 0.8);
+			cr.Fill ();
 		}
 		
 		protected override Gdk.Pixbuf ProcessPixbuf (Gdk.Pixbuf pbuf)
 
=== modified file 'StandardPlugins/Weather/src/WeatherPainter.cs'
--- StandardPlugins/Weather/src/WeatherPainter.cs	2010-06-24 11:45:49 +0000
+++ StandardPlugins/Weather/src/WeatherPainter.cs	2011-01-03 11:34:09 +0000
@@ -49,6 +49,20 @@
 		/// </value>
 		static readonly Cairo.Color colorLow = new Cairo.Color (0.427, 0.714, 0.945, 1);
 		
+		static Pango.Layout layout;
+		
+		static WeatherPainter ()
+		{
+			Gtk.Style style = new Gtk.Style ();
+			
+			layout = DockServices.Drawing.ThemedPangoLayout ();
+			layout.FontDescription = style.FontDescription;
+			layout.FontDescription.Weight = Pango.Weight.Bold;
+			layout.Ellipsize = Pango.EllipsizeMode.None;
+			
+			style.Dispose ();
+		}
+		
 		/// <summary>
 		/// Creates a new weather painter object.
 		/// </summary>
@@ -102,68 +116,60 @@
 			int xOffset = BUTTON_SIZE;
 			int cellWidth = (Allocation.Width - 2 * BUTTON_SIZE) / (WeatherController.Weather.ForecastDays * 2);
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				Pango.Rectangle inkRect, logicalRect;
-				
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (cellWidth);
-				
-				for (int day = 0; day < WeatherController.Weather.ForecastDays; day++)
-				{
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (cellWidth / 5));
-					
-					cr.Color = colorTitle;
-					layout.SetText (string.Format ("{0}", WeatherForecast.DayShortName (WeatherController.Weather.Forecasts [day].dow)));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (xOffset + (cellWidth - inkRect.Width) / 2, 0);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
-					
-					cr.Color = colorHigh;
-					layout.SetText (string.Format ("{0}{1}", WeatherController.Weather.Forecasts [day].high, AbstractWeatherSource.TempUnit));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (xOffset + (cellWidth - inkRect.Width) / 2, Allocation.Height / 2 - logicalRect.Height / 2);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
-					
-					cr.Color = colorLow;
-					layout.SetText (string.Format ("{0}{1}", WeatherController.Weather.Forecasts [day].low, AbstractWeatherSource.TempUnit));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (xOffset + (cellWidth - inkRect.Width) / 2, Allocation.Height - logicalRect.Height);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Fill ();
-					
-					using (Gdk.Pixbuf pbuf = DockServices.Drawing.LoadIcon (WeatherController.Weather.Forecasts [day].image, cellWidth - 5))
-					{
-						Gdk.CairoHelper.SetSourcePixbuf (cr, pbuf, xOffset + cellWidth + 2, 5 + (Allocation.Height - cellWidth) / 2);
-						cr.PaintWithAlpha (WeatherController.Weather.Forecasts [day].chanceOf ? .6 : 1);
-					}
-					
-					if (WeatherController.Weather.Forecasts [day].chanceOf)
-					{
-						layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (cellWidth / 2));
-						
-						layout.SetText ("?");
-						
-						layout.GetPixelExtents (out inkRect, out logicalRect);
-						cr.MoveTo (xOffset + cellWidth + (cellWidth - inkRect.Width) / 2, Allocation.Height / 2 - logicalRect.Height / 2);
-						
-						cr.LineWidth = 4;
-						cr.Color = new Cairo.Color (0, 0, 0, 0.3);
-						Pango.CairoHelper.LayoutPath (cr, layout);
-						cr.StrokePreserve ();
-						
-						cr.Color = new Cairo.Color (1, 1, 1, .6);
-						cr.Fill ();
-					}
-					
-					xOffset += 2 * cellWidth;
-				}
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
+			Pango.Rectangle inkRect, logicalRect;
+			
+			layout.Width = Pango.Units.FromPixels (cellWidth);
+			
+			for (int day = 0; day < WeatherController.Weather.ForecastDays; day++)
+			{
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (cellWidth / 5));
+				
+				cr.Color = colorTitle;
+				layout.SetText (string.Format ("{0}", WeatherForecast.DayShortName (WeatherController.Weather.Forecasts [day].dow)));
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (xOffset + (cellWidth - inkRect.Width) / 2, 0);
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Fill ();
+				
+				cr.Color = colorHigh;
+				layout.SetText (string.Format ("{0}{1}", WeatherController.Weather.Forecasts [day].high, AbstractWeatherSource.TempUnit));
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (xOffset + (cellWidth - inkRect.Width) / 2, Allocation.Height / 2 - logicalRect.Height / 2);
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Fill ();
+				
+				cr.Color = colorLow;
+				layout.SetText (string.Format ("{0}{1}", WeatherController.Weather.Forecasts [day].low, AbstractWeatherSource.TempUnit));
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (xOffset + (cellWidth - inkRect.Width) / 2, Allocation.Height - logicalRect.Height);
+				Pango.CairoHelper.LayoutPath (cr, layout);
+				cr.Fill ();
+				
+				using (Gdk.Pixbuf pbuf = DockServices.Drawing.LoadIcon (WeatherController.Weather.Forecasts [day].image, cellWidth - 5))
+				{
+					Gdk.CairoHelper.SetSourcePixbuf (cr, pbuf, xOffset + cellWidth + 2, 5 + (Allocation.Height - cellWidth) / 2);
+					cr.PaintWithAlpha (WeatherController.Weather.Forecasts [day].chanceOf ? .6 : 1);
+				}
+				
+				if (WeatherController.Weather.Forecasts [day].chanceOf)
+				{
+					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (cellWidth / 2));
+					
+					layout.SetText ("?");
+					
+					layout.GetPixelExtents (out inkRect, out logicalRect);
+					cr.MoveTo (xOffset + cellWidth + (cellWidth - inkRect.Width) / 2, Allocation.Height / 2 - logicalRect.Height / 2);
+					
+					cr.LineWidth = 4;
+					cr.Color = new Cairo.Color (0, 0, 0, 0.3);
+					Pango.CairoHelper.LayoutPath (cr, layout);
+					cr.StrokePreserve ();
+					
+					cr.Color = new Cairo.Color (1, 1, 1, .6);
+					cr.Fill ();
+				}
+				
+				xOffset += 2 * cellWidth;
 			}
 		}
 		
@@ -192,47 +198,39 @@
 			if (max <= min)
 				return;
 			
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				Pango.Rectangle inkRect, logicalRect;
-				
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (Allocation.Height / 5));
-				
-				// high/low temp
-				layout.Width = Pango.Units.FromPixels (Allocation.Height);
-				cr.Color = colorHigh;
-				layout.SetText (string.Format ("{0}{1}", max, AbstractWeatherSource.TempUnit));
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				cr.MoveTo (Allocation.Width - Allocation.Height + (Allocation.Height - inkRect.Width) / 2 - BUTTON_SIZE, Allocation.Height / 6 - logicalRect.Height / 2);
-				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.Fill ();
-				
-				cr.Color = colorLow;
-				layout.SetText (string.Format ("{0}{1}", min, AbstractWeatherSource.TempUnit));
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				cr.MoveTo (Allocation.Width - Allocation.Height + (Allocation.Height - inkRect.Width) / 2 - BUTTON_SIZE, Allocation.Height * 6 / 9 - logicalRect.Height / 2);
-				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.Fill ();
-				
-				// day names
-				layout.Width = Pango.Units.FromPixels (2 * Allocation.Height);
-				
-				cr.Color = colorTitle;
-				for (int day = 0; day < WeatherController.Weather.ForecastDays; day++)
-				{
-					layout.SetText (WeatherForecast.DayShortName (WeatherController.Weather.Forecasts [day].dow));
-					layout.GetPixelExtents (out inkRect, out logicalRect);
-					cr.MoveTo (BUTTON_SIZE + day * Allocation.Height * 2 + (Allocation.Height - inkRect.Width) / 2, Allocation.Height * 8 / 9 - logicalRect.Height / 2);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-				}
-				cr.Fill ();
-				cr.Save ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
+			Pango.Rectangle inkRect, logicalRect;
+			
+			layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (Allocation.Height / 5));
+			
+			// high/low temp
+			layout.Width = Pango.Units.FromPixels (Allocation.Height);
+			cr.Color = colorHigh;
+			layout.SetText (string.Format ("{0}{1}", max, AbstractWeatherSource.TempUnit));
+			layout.GetPixelExtents (out inkRect, out logicalRect);
+			cr.MoveTo (Allocation.Width - Allocation.Height + (Allocation.Height - inkRect.Width) / 2 - BUTTON_SIZE, Allocation.Height / 6 - logicalRect.Height / 2);
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.Fill ();
+			
+			cr.Color = colorLow;
+			layout.SetText (string.Format ("{0}{1}", min, AbstractWeatherSource.TempUnit));
+			layout.GetPixelExtents (out inkRect, out logicalRect);
+			cr.MoveTo (Allocation.Width - Allocation.Height + (Allocation.Height - inkRect.Width) / 2 - BUTTON_SIZE, Allocation.Height * 6 / 9 - logicalRect.Height / 2);
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.Fill ();
+			
+			// day names
+			layout.Width = Pango.Units.FromPixels (2 * Allocation.Height);
+			
+			cr.Color = colorTitle;
+			for (int day = 0; day < WeatherController.Weather.ForecastDays; day++)
+			{
+				layout.SetText (WeatherForecast.DayShortName (WeatherController.Weather.Forecasts [day].dow));
+				layout.GetPixelExtents (out inkRect, out logicalRect);
+				cr.MoveTo (BUTTON_SIZE + day * Allocation.Height * 2 + (Allocation.Height - inkRect.Width) / 2, Allocation.Height * 8 / 9 - logicalRect.Height / 2);
+				Pango.CairoHelper.LayoutPath (cr, layout);
 			}
+			cr.Fill ();
+			cr.Save ();
 			
 			// draw tick lines
 			cr.Color = new Cairo.Color (0.627, 0.627, 0.627, .8);
@@ -359,29 +357,21 @@
 		
 		void DrawConditionText (Cairo.Context cr, int x, int xWidth, int yCenter, string text)
 		{
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				Pango.Rectangle inkRect, logicalRect;
-				
-				layout.FontDescription = new Gtk.Style().FontDescription;
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (Allocation.Width - BUTTON_SIZE - x);
-				
-				if (WeatherController.Weather.ForecastDays < 6)
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (Allocation.Height / 5));
-				else
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (Allocation.Height / 3.5));
-				
-				cr.Color = new Cairo.Color (1, 1, 1, 0.9);
-				layout.SetText (text);
-				layout.GetPixelExtents (out inkRect, out logicalRect);
-				cr.MoveTo (x + (xWidth - logicalRect.Width) / 2, yCenter - logicalRect.Height / 2);
-				Pango.CairoHelper.LayoutPath (cr, layout);
-				cr.Fill ();
-				
-				layout.FontDescription.Dispose ();
-				layout.Context.Dispose ();
-			}
+			Pango.Rectangle inkRect, logicalRect;
+			
+			layout.Width = Pango.Units.FromPixels (Allocation.Width - BUTTON_SIZE - x);
+			
+			if (WeatherController.Weather.ForecastDays < 6)
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (Allocation.Height / 5));
+			else
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels ((int) (Allocation.Height / 3.5));
+			
+			cr.Color = new Cairo.Color (1, 1, 1, 0.9);
+			layout.SetText (text);
+			layout.GetPixelExtents (out inkRect, out logicalRect);
+			cr.MoveTo (x + (xWidth - logicalRect.Width) / 2, yCenter - logicalRect.Height / 2);
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.Fill ();
 		}
 		
 		/// <summary>