Started working on font packs

2 files changed, 6 insertions, 29 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index cbce4715..e3f7f7c4 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -385,8 +385,8 @@ static void initFonts_Text_(iText *d) {
         { &fontSourceSans3Regular_Embedded,   uiSize * 1.125f,      1.0f, uiMedium_FontSize },
         { &fontSourceSans3Regular_Embedded,   uiSize * 1.333f,      1.0f, uiBig_FontSize },
         { &fontSourceSans3Regular_Embedded,   uiSize * 1.666f,      1.0f, uiLarge_FontSize },
-        { &fontSourceSans3Regular_Embedded,   uiSize * 0.900f,      1.0f, uiSmall_FontSize },
         { &fontSourceSans3Semibold_Embedded,  uiSize * 0.800f,      1.0f, uiTiny_FontSize },
+        { &fontSourceSans3Regular_Embedded,   uiSize * 0.900f,      1.0f, uiSmall_FontSize },
         /* UI fonts: bold weight */
         { &fontSourceSans3Bold_Embedded,      uiSize,               1.0f, uiNormal_FontSize },
         { &fontSourceSans3Bold_Embedded,      uiSize * 1.125f,      1.0f, uiMedium_FontSize },
@@ -408,12 +408,12 @@ static void initFonts_Text_(iText *d) {
         { &fontSourceSans3Regular_Embedded,   textSize * 0.80f,     scaling, contentRegular_FontSize },
         /* symbols and scripts */
 #define DEFINE_FONT_SET(data, glyphScale) \
+        { (data), uiSize * 0.800f,   glyphScale, uiTiny_FontSize }, \
+        { (data), uiSize * 0.900f,   glyphScale, uiSmall_FontSize }, \
         { (data), uiSize,            glyphScale, uiNormal_FontSize }, \
         { (data), uiSize * 1.125f,   glyphScale, uiMedium_FontSize }, \
         { (data), uiSize * 1.333f,   glyphScale, uiBig_FontSize }, \
         { (data), uiSize * 1.666f,   glyphScale, uiLarge_FontSize }, \
-        { (data), uiSize * 0.900f,   glyphScale, uiSmall_FontSize }, \
-        { (data), uiSize * 0.800f,   glyphScale, uiTiny_FontSize }, \
         { (data), textSize,          glyphScale, contentRegular_FontSize }, \
         { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \
         { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \
diff --git a/src/ui/text.h b/src/ui/text.h
index 35ae48f8..1b3200d4 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -25,34 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/rect.h>
 #include <the_Foundation/string.h>
 #include <the_Foundation/vec2.h>
-
 #include <SDL_render.h>
 
-/* Content sizes: regular (1x) -> medium (1.2x) -> big (1.33x) -> large (1.67x) -> huge (2x) */
-
-enum iFontSize {
-    uiNormal_FontSize, /* 1.000 */
-    uiMedium_FontSize, /* 1.125 */
-    uiBig_FontSize,    /* 1.333 */
-    uiLarge_FontSize,  /* 1.666 */
-    uiSmall_FontSize,  /* 0.900 */
-    uiTiny_FontSize,   /* 0.800 */
-    contentRegular_FontSize,
-    contentMedium_FontSize,
-    contentBig_FontSize,
-    contentLarge_FontSize,
-    contentHuge_FontSize,
-    contentMonoSmall_FontSize,
-    contentMono_FontSize,
-    max_FontSize,
-};
+#include "fontpack.h"
 
-iLocalDef enum iFontSize larger_FontSize(enum iFontSize size) {
-    if (size == uiLarge_FontSize || size == contentHuge_FontSize || size == contentMono_FontSize) {
-        return size; /* biggest available */
-    }
-    return size + 1;
-}
+/* Content sizes: regular (1x) -> medium (1.2x) -> big (1.33x) -> large (1.67x) -> huge (2x) */
 
 enum iFontId {
     /* UI fonts: normal weight (1x, 1.125x, 1.33x, 1.67x) */
@@ -60,8 +37,8 @@ enum iFontId {
     defaultMedium_FontId,
     defaultBig_FontId,
     defaultLarge_FontId,
-    defaultSmall_FontId,
     defaultTiny_FontId,
+    defaultSmall_FontId,
     /* UI fonts: bold weight */
     defaultBold_FontId,
     defaultMediumBold_FontId,