[goffice] GOFormat: further trouble with 8.37 formatted wide.



commit bdb4376ff49b44e16f7127bd2c34d089b94c0bd2
Author: Morten Welinder <terra gnome org>
Date:   Sat Aug 1 12:10:13 2015 -0400

    GOFormat: further trouble with 8.37 formatted wide.

 ChangeLog                 |    5 +++++
 goffice/utils/go-format.c |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 035665d..5a88c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-01  Morten Welinder  <terra gnome org>
+
+       * goffice/utils/go-format.c (go_render_general): Also try the
+       shortest representation when we're barely width limited.
+
 2015-07-28  Morten Welinder <terra gnome org>
 
        * configure.ac: Post-release bump.
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index f7d392a..e32ef02 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -4955,8 +4955,9 @@ SUFFIX(go_render_general) (PangoLayout *layout, GString *str,
                        /* We're limited by width.  */
                        maxdigits = w;
                        check_val = FALSE;
-               } else
-                       try_needed = TRUE;
+               }
+
+               try_needed = (w >= maxdigits);
        }
 
        if (try_needed) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]