[gbrainy] Fixes bug #607065
- From: Jordi Mas <jmas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gbrainy] Fixes bug #607065
- Date: Sat, 16 Jan 2010 11:50:05 +0000 (UTC)
commit 4c8ba43f6cef9cae2f381782274736e82a622ed4
Author: Jordi Mas <jmas softcatala org>
Date: Sat Jan 16 12:50:27 2010 +0100
Fixes bug #607065
src/Core/Libraries/CairoContextEx.cs | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/src/Core/Libraries/CairoContextEx.cs b/src/Core/Libraries/CairoContextEx.cs
index 8b25739..c2135c3 100644
--- a/src/Core/Libraries/CairoContextEx.cs
+++ b/src/Core/Libraries/CairoContextEx.cs
@@ -33,31 +33,22 @@ namespace gbrainy.Core.Libraries
double font_size;
static SVGImage image = null;
- const double line_space = 0.018;
const double width_margin = 0.04;
public CairoContextEx (IntPtr state, Gtk.Widget widget) : base (state)
{
- CommonConstructor ();
+ layout = Pango.CairoHelper.CreateLayout (this);
- double resolution = widget.Screen.Resolution;
- if (resolution != -1) {
- Pango.Context c = layout.Context;
- Pango.CairoHelper.ContextSetResolution (c, resolution);
- c.Dispose ();
- }
+ // We do not honor DPI settings or font sizes (just font name)
+ // User should resize the window
+ layout.FontDescription = widget.PangoContext.FontDescription.Copy ();
+ SetPangoNormalFontSize ();
}
// Used by GeneratePDF
public CairoContextEx (Cairo.Surface s) : base (s)
{
- CommonConstructor ();
- }
-
- private void CommonConstructor ()
- {
layout = Pango.CairoHelper.CreateLayout (this);
- layout.FontDescription = FontDescription.FromString ("Sans");
SetPangoNormalFontSize ();
}
@@ -69,7 +60,7 @@ namespace gbrainy.Core.Libraries
private void UpdateFontSize ()
{
- layout.FontDescription.Size = (int) (font_size * Pango.Scale.PangoScale * Matrix.Xx);
+ layout.FontDescription.Size = (int) (font_size * Pango.Scale.PangoScale * Matrix.Xx);
}
/*
@@ -133,7 +124,7 @@ namespace gbrainy.Core.Libraries
public void SetPangoNormalFontSize ()
{
- font_size = 0.022;
+ font_size = 0.025;
}
public void SetPangoLargeFontSize ()
@@ -205,7 +196,6 @@ namespace gbrainy.Core.Libraries
else
layout.Width = (int) (width * old.Xx * Pango.Scale.PangoScale);
- layout.Spacing = (int) (line_space * (old.Xx * Pango.Scale.PangoScale));
layout.SingleParagraphMode = false;
layout.SetText (str);
Pango.CairoHelper.ShowLayout (this, layout);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]