From 53e753b7cb1b6b8c018d9fca2a146ddd4eea4f9f Mon Sep 17 00:00:00 2001 From: Nelson Carrillo Date: Sat, 19 Sep 2015 12:35:13 -0400 Subject: [PATCH] Implemented PushOpacity for Cairo --- src/Gtk/Perspex.Cairo/Media/DrawingContext.cs | 8 ++++++-- src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs b/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs index 31ab48f2c0..324ba136e1 100644 --- a/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs +++ b/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs @@ -203,8 +203,12 @@ namespace Perspex.Cairo.Media /// A disposable used to undo the opacity. public IDisposable PushOpacity(double opacity) { - // TODO: Implement - return Disposable.Empty; + opacityOverride = opacity; + + return Disposable.Create(() => + { + opacityOverride = 1.0f; + }); } /// diff --git a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs index 81ae567817..0fe9afd857 100644 --- a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs +++ b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs @@ -30,7 +30,7 @@ namespace Perspex.Cairo.Media Layout.FontDescription = new Pango.FontDescription { Family = fontFamily, - Size = Pango.Units.FromDouble(fontSize * 0.73), + Size = Pango.Units.FromDouble(fontSize), Style = (Pango.Style)fontStyle, Weight = fontWeight.ToCairo() };