freetype-commit
[Top][All Lists]
Advanced

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

[freetype2-demos] master 28000f1: * src/ftview.c (INIT_SIZE): Improve ve


From: Werner LEMBERG
Subject: [freetype2-demos] master 28000f1: * src/ftview.c (INIT_SIZE): Improve vertical start position.
Date: Wed, 29 Mar 2017 06:05:39 -0400 (EDT)

branch: master
commit 28000f1ab5dd2a41ec848c3358fe977922c7a5f0
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/ftview.c (INIT_SIZE): Improve vertical start position.
---
 ChangeLog    |  4 ++++
 src/ftview.c | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 11d5376..5caf23e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-29  Werner Lemberg  <address@hidden>
+
+       * src/ftview.c (INIT_SIZE): Improve vertical start position.
+
 2017-03-27  Alexei Podtelezhnikov  <address@hidden>
 
        [ftview] Stuff right margin.
diff --git a/src/ftview.c b/src/ftview.c
index f64d2c6..6fd328f 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -46,14 +46,15 @@
 #define START_X  18 * 8
 #define START_Y  4 * HEADER_HEIGHT
 
-#define INIT_SIZE( size, start_x, start_y, step_y, x, y )     \
-          do {                                                \
-            start_x = START_X;                                \
-            start_y = CEIL( size->metrics.height ) + START_Y; \
-            step_y  = CEIL( size->metrics.height ) + 4;       \
-                                                              \
-            x = start_x;                                      \
-            y = start_y;                                      \
+#define INIT_SIZE( size, start_x, start_y, step_y, x, y )        \
+          do {                                                   \
+            start_x = START_X;                                   \
+            start_y = CEIL( size->metrics.ascender -             \
+                            size->metrics.descender ) + START_Y; \
+            step_y  = CEIL( size->metrics.height ) + 4;          \
+                                                                 \
+            x = start_x;                                         \
+            y = start_y;                                         \
           } while ( 0 )
 
 #define X_TOO_LONG( x, slot, display )                   \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]