[freetype2-demos] master 8eaee20: * src/ftcommon.c (FTDemo_Draw_Header): Show gamma in second line.

[Werner LEMBERG]

branch: master
commit 8eaee2061202e466dc08f0d7be0e7c00ec3a1396
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/ftcommon.c (FTDemo_Draw_Header): Show gamma in second line.
    
    Otherwise it clashes with long file names.
---
 ChangeLog      |  6 ++++++
 src/ftcommon.c | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00f8e89..be2398b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-10  Werner Lemberg  <address@hidden>
+
+       * src/ftcommon.c (FTDemo_Draw_Header): Show gamma in second line.
+
+       Otherwise it clashes with long file names.
+
 2017-06-03  Alexei Podtelezhnikov  <address@hidden>
 
        [ftview] Merge gray and color sbits controls.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 0e438bc..1108221 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -798,7 +798,7 @@
       else
         sprintf( buf, "(%dppem)",
                       face->size->metrics.y_ppem );
-      grWriteCellString( display->bitmap, 8 * x, line++ * HEADER_HEIGHT,
+      grWriteCellString( display->bitmap, 8 * x, line * HEADER_HEIGHT,
                          buf, highlight ? display->warn_color
                                         : display->fore_color );
     }
@@ -817,10 +817,20 @@
         sprintf( buf, "error 0x%04x",
                       (FT_UShort)error_code );
       }
-      grWriteCellString( display->bitmap, 8 * x, line++ * HEADER_HEIGHT,
+      grWriteCellString( display->bitmap, 8 * x, line * HEADER_HEIGHT,
                          buf, display->warn_color );
     }
 
+    /* gamma */
+    if ( display->gamma == 0.0 )
+      sprintf( buf, "gamma: sRGB" );
+    else
+      sprintf( buf, "gamma = %.1f", display->gamma );
+    grWriteCellString( display->bitmap, DIM_X - 8 * 11, line * HEADER_HEIGHT,
+                       buf, display->fore_color );
+
+    line++;
+
     /* encoding charcode or glyph index, glyph name */
     if ( idx >= 0 )
     {
@@ -915,13 +925,6 @@
                          buf, display->fore_color );
     }
 
-    /* gamma */
-    if ( display->gamma == 0.0 )
-      sprintf( buf, "gamma: sRGB" );
-    else
-      sprintf( buf, "gamma = %.1f", display->gamma );
-    grWriteCellString( display->bitmap, DIM_X - 8 * 11, 0,
-                       buf, display->fore_color );
   }