[freetype2-demos] master a6e89b4: [ftgrid, ftmulti, ftdiff] Fix up layout for the larger font.

[Alexei Podtelezhnikov]

branch: master
commit a6e89b462ae958d7002067e455a0e0de3e6c6261
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [ftgrid,ftmulti,ftdiff] Fix up layout for the larger font.
    
    * src/ftgrid.c (DO_DOTNUMBERS): Rely on GR_FONT_SIZE.
    * src/ftmulti.c, src/ftdiff.c: Use HEADER_HEIGHT equal to 12.
---
 ChangeLog     |  7 +++++++
 src/ftdiff.c  |  4 ++--
 src/ftgrid.c  |  2 +-
 src/ftmulti.c | 13 ++++++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8c0187..639316b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2020-11-06  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
+       [ftgrid,ftmulti,ftdiff] Fix up layout for the larger font.
+
+       * src/ftgrid.c (DO_DOTNUMBERS): Rely on GR_FONT_SIZE.
+       * src/ftmulti.c, src/ftdiff.c: Use HEADER_HEIGHT equal to 12.
+
+2020-11-06  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
        [graph] Switch to larger 8x14 font.
 
        * graph/grconfig.h (GR_FONT_SIZE): New option defined as 14.
diff --git a/src/ftdiff.c b/src/ftdiff.c
index e6a9985..8c5c600 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -1482,7 +1482,7 @@
               face->family_name,
               face->style_name,
               basename );
-    grWriteCellString( adisplay->bitmap, 0, 5,
+    grWriteCellString( adisplay->bitmap, 0, 2,
                        buf, adisplay->fore_color );
 
     if ( adisplay->gamma != 0.0 )
@@ -1492,7 +1492,7 @@
               (int)( state->char_size * state->resolution / 72 + 0.5 ),
               state->resolution,
               gamma );
-    grWriteCellString( adisplay->bitmap, 0, 5 + HEADER_HEIGHT,
+    grWriteCellString( adisplay->bitmap, 0, 2 + HEADER_HEIGHT,
                        buf, adisplay->fore_color );
 
   }
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 96df1b1..01f334d 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -775,7 +775,7 @@
                                                 : 2 ),
                                st->y_origin -
                                  ( ( ( points[n].y - middle.y ) >> 6 ) +
-                                   8 / 2 ),
+                                   GR_FONT_SIZE / 2 ),
                                number_string,
                                ( tags[n] & FT_CURVE_TAG_ON )
                                  ? st->on_color
diff --git a/src/ftmulti.c b/src/ftmulti.c
index 693685b..5abf2cd 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -34,6 +34,8 @@
 #define  DIM_X   640
 #define  DIM_Y   480
 
+#define  HEADER_HEIGHT  12
+
 #define  MAXPTSIZE    500               /* dtp */
 #define  MAX_MM_AXES    6
 
@@ -390,7 +392,8 @@
 
 
     start_x = 4;
-    start_y = pt_size + ( num_shown_axes > MAX_MM_AXES / 2 ? 52 : 44 );
+    start_y = pt_size + HEADER_HEIGHT *
+                        ( num_shown_axes > MAX_MM_AXES / 2 ? 6 : 5 );
 
     step_y = size->metrics.y_ppem + 10;
 
@@ -1181,7 +1184,7 @@
         strbuf_reset( header );
         strbuf_format( header, "PS name: %s",
                        FT_Get_Postscript_Name( face ) );
-        grWriteCellString( bit, 0, 16, Header, fore_color );
+        grWriteCellString( bit, 0, 2 * HEADER_HEIGHT, Header, fore_color );
 
         strbuf_reset( header );
         strbuf_add( header, "axes:" );
@@ -1203,7 +1206,7 @@
                            design_pos[axis] / 65536.0 );
           }
         }
-        grWriteCellString( bit, 0, 24, Header, fore_color );
+        grWriteCellString( bit, 0, 3 * HEADER_HEIGHT, Header, fore_color );
 
         if ( num_shown_axes > MAX_MM_AXES / 2 )
         {
@@ -1224,7 +1227,7 @@
                            design_pos[axis] / 65536.0 );
           }
 
-          grWriteCellString( bit, 0, 32, Header, fore_color );
+          grWriteCellString( bit, 0, 4 * HEADER_HEIGHT, Header, fore_color );
         }
 
         {
@@ -1265,7 +1268,7 @@
                        "%.100s: not an MM font file, or could not be opened",
                        ft_basename( argv[file] ) );
 
-      grWriteCellString( bit, 0, 8, Header, fore_color );
+      grWriteCellString( bit, 0, HEADER_HEIGHT, Header, fore_color );
       grRefreshSurface( surface );
 
       if ( !( key = Process_Event() ) )