From a2f47cbf11530b81d7d8e36305e663f01256f8dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Granjoux?= Date: Sat, 17 Sep 2011 15:18:08 +0200 Subject: [PATCH] scintilla: Font selection was broken since Gtk+3 scintilla update --- plugins/scintilla/scintilla/PlatGTK.cxx | 2 +- plugins/scintilla/scintilla/patches/scintilla-pango-always.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scintilla/scintilla/PlatGTK.cxx b/plugins/scintilla/scintilla/PlatGTK.cxx index 850f201..bbf4126 100644 --- a/plugins/scintilla/scintilla/PlatGTK.cxx +++ b/plugins/scintilla/scintilla/PlatGTK.cxx @@ -722,7 +722,7 @@ FontID FontCached::CreateNewFont(const char *fontName, int characterSet, // Try to use pango font even if it's not specified PangoFontDescription *pfd = pango_font_description_new(); if (pfd) { - pango_font_description_set_family(pfd, fontName+1); + pango_font_description_set_family(pfd, fontName); pango_font_description_set_size(pfd, size * PANGO_SCALE); pango_font_description_set_weight(pfd, bold ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL); pango_font_description_set_style(pfd, italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL); diff --git a/plugins/scintilla/scintilla/patches/scintilla-pango-always.diff b/plugins/scintilla/scintilla/patches/scintilla-pango-always.diff index 1f05f06..233e682 100644 --- a/plugins/scintilla/scintilla/patches/scintilla-pango-always.diff +++ b/plugins/scintilla/scintilla/patches/scintilla-pango-always.diff @@ -8,7 +8,7 @@ diff -u3 scintilla/gtk/PlatGTK.orig.cxx scintilla/PlatGTK.cxx + // Try to use pango font even if it's not specified + PangoFontDescription *pfd = pango_font_description_new(); + if (pfd) { -+ pango_font_description_set_family(pfd, fontName+1); ++ pango_font_description_set_family(pfd, fontName); + pango_font_description_set_size(pfd, size * PANGO_SCALE); + pango_font_description_set_weight(pfd, bold ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL); + pango_font_description_set_style(pfd, italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL); -- 2.11.4.GIT