From d809ac4d10d06d3669134f8808223910effb2702 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sat, 22 Apr 2023 02:44:19 -0700 Subject: [PATCH] Adjusted kerning --- bin/custom_font.c | 4 ++-- src/pc/djui/djui_font.c | 2 +- src/pc/djui/djui_unicode.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/custom_font.c b/bin/custom_font.c index fce5ed07..e4c853eb 100644 --- a/bin/custom_font.c +++ b/bin/custom_font.c @@ -15,11 +15,11 @@ const f32 font_normal_widths[] = { /* : ; < = > ? @ */ 6, 8, 10, 12, 10, 11, 18, /* A B C D E F G H I J K L M N O P Q R S T U V W X Y Z */ - 12, 12, 12, 12, 12, 10, 12, 12, 10, 12, 12, 10, 16, 16, 12, 12, 12, 12, 12, 10, 12, 12, 16, 14, 12, 12, + 12, 12, 12, 12, 11, 10, 12, 12, 9, 12, 12, 10, 16, 16, 12, 11, 12, 12, 12, 10, 12, 10, 16, 14, 12, 12, /* [ \ ] ^ _ ` */ 10, 10, 10, 12, 12, 8, /* a b c d e f g h i j k l m n o p q r s t u v w x y z */ - 10, 10, 10, 10, 10, 8, 12, 10, 7, 10, 10, 5, 14, 10, 10, 10, 10, 9, 10, 10, 10, 9, 14, 12, 10, 10, + 10, 10, 10, 10, 9, 8, 12, 10, 7, 9, 10, 4, 13, 10, 9, 9, 10, 9, 10, 9, 10, 9, 14, 12, 10, 10, /* { | } ~ DEL */ 10, 8, 10, 16, 10, }; diff --git a/src/pc/djui/djui_font.c b/src/pc/djui/djui_font.c index 9bd31cd0..9e1a4cde 100644 --- a/src/pc/djui/djui_font.c +++ b/src/pc/djui/djui_font.c @@ -19,7 +19,7 @@ static void djui_font_normal_render_char(char* c) { } static f32 djui_font_normal_char_width(char* c) { - if (*c == ' ') { return 5 / 32.0f; } + if (*c == ' ') { return 6 / 32.0f; } extern const f32 font_normal_widths[]; return djui_unicode_get_sprite_width(c, font_normal_widths) / 32.0f; } diff --git a/src/pc/djui/djui_unicode.c b/src/pc/djui/djui_unicode.c index 1d651e38..46f19d9d 100644 --- a/src/pc/djui/djui_unicode.c +++ b/src/pc/djui/djui_unicode.c @@ -71,18 +71,18 @@ struct SmCodeGlyph sSmCodeGlyphs[] = { { "ý", 'y', 0, 0 }, { "ÿ", 'y', 0, 0 }, - { "æ", 'a', 0.5000f, 0 }, - { "Æ", 'a', 0.6000f, 0 }, - { "œ", 'o', 0.5000f, 0 }, - { "Œ", 'o', 0.5000f, 0 }, + { "æ", 'a', 15, 0 }, + { "Æ", 'a', 16, 0 }, + { "œ", 'o', 15, 0 }, + { "Œ", 'o', 16, 0 }, { "ð", 'd', 0, 0 }, - { "Ð", 'D', 0.4375f, 0 }, + { "Ð", 'D', 14, 0 }, { "ø", 'o', 0, 0 }, { "Ø", 'O', 0, 0 }, { "ß", 'S', 0, 0 }, { "¡", '!', 0, 0 }, - { "¿", '?', 0.3750f, 0 }, + { "¿", '?', 12, 0 }, { "Б", 15, 0, 0 }, { "Г", 14, 0, 0 },