freetype-commit
[Top][All Lists]
Advanced

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

[freetype2-demos] master ef94793: * ftcommon.c (FTDemo_Draw_Header): Rig


From: Alexei Podtelezhnikov
Subject: [freetype2-demos] master ef94793: * ftcommon.c (FTDemo_Draw_Header): Right-flush filename.
Date: Mon, 4 May 2020 23:03:12 -0400 (EDT)

branch: master
commit ef947936d495ca51d64dac5251259165c834f0bc
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * ftcommon.c (FTDemo_Draw_Header): Right-flush filename.
---
 ChangeLog      |  4 ++++
 src/ftcommon.c | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9f4c56..a9b3499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-05-04  Alexei Podtelezhnikov  <address@hidden>
 
+       * ftcommon.c (FTDemo_Draw_Header): Right-flush filename.
+
+2020-05-04  Alexei Podtelezhnikov  <address@hidden>
+
        Move man pages: src/*.1 -> man/*.1
 
 2020-05-03  Alexei Podtelezhnikov  <address@hidden>
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 09766e3..6557046 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -938,12 +938,16 @@
 
 
     /* font and file name */
-    basename = ft_basename( handle->current_font->filepathname );
-    sprintf( buf, "%.50s %.50s (file `%.100s')",
-             face->family_name, face->style_name, basename );
-    grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
+    x = sprintf( buf, "%.50s %.50s", face->family_name, face->style_name );
+    grWriteCellString( display->bitmap, 0, line * HEADER_HEIGHT,
                        buf, display->fore_color );
 
+    basename = ft_basename( handle->current_font->filepathname );
+    x = display->bitmap->width - 8 * (int)strlen( basename ) > 8 * x + 8 ?
+        display->bitmap->width - 8 * (int)strlen( basename ) : 8 * x + 8;
+    grWriteCellString( display->bitmap, x, line++ * HEADER_HEIGHT,
+                       basename, display->fore_color );
+
     /* ppem, pt and dpi, instance */
     ppem = FT_IS_SCALABLE( face ) ? FT_MulFix( face->units_per_EM,
                                                face->size->metrics.y_scale )



reply via email to

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