From c5ed3e56c9fabb3a93b39ef17f95e07172c83b98 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Sat, 27 Sep 2014 23:48:39 +0200
Subject: [PATCH] Bug 735505 - Weird Characters in Zoom Button
On windows, use a normal space instead of U+2009 THIN SPACE for
separating the scale percentage from the percent sign.
---
app/display/gimpscalecombobox.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/app/display/gimpscalecombobox.c b/app/display/gimpscalecombobox.c
index 40ca369561..1d0a3b95ff 100644
--- a/app/display/gimpscalecombobox.c
+++ b/app/display/gimpscalecombobox.c
@@ -376,14 +376,26 @@ gimp_scale_combo_box_scale_iter_set (GtkListStore *store,
{
gchar label[32];
+#ifdef G_OS_WIN32
+
+ /* use a normal space until pango's windows backend uses harfbuzz,
+ * see bug #735505
+ */
+#define PERCENT_SPACE " "
+
+#else
+
/* use U+2009 THIN SPACE to separate the percent sign from the number */
+#define PERCENT_SPACE "\342\200\211"
+
+#endif
if (scale > 1.0)
g_snprintf (label, sizeof (label),
- "%d\342\200\211%%", (gint) ROUND (100.0 * scale));
+ "%d" PERCENT_SPACE "%%", (gint) ROUND (100.0 * scale));
else
g_snprintf (label, sizeof (label),
- "%.3g\342\200\211%%", 100.0 * scale);
+ "%.3g" PERCENT_SPACE "%%", 100.0 * scale);
gtk_list_store_set (store, iter,
COLUMN_SCALE, scale,