4 files changed, 15 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d11e43e..71940aa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,10 @@ set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
 make_resources (${EMB_BIN} ${RESOURCES})
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 if (IOS)
-    set (EMB_FONTS res/fonts/SourceSans3-Regular.ttf)
+    set (EMB_FONTS
+        res/fonts/SourceSans3-Regular.ttf
+        res/fonts/IosevkaTerm-Extended.ttf
+    )
     set_source_files_properties (${EMB_FONTS}
         PROPERTIES MACOSX_PACKAGE_LOCATION Resources
     )
diff --git a/res/iOSBundleInfo.plist.in b/res/iOSBundleInfo.plist.in
index 5a02ed68..c0c1a288 100644
--- a/res/iOSBundleInfo.plist.in
+++ b/res/iOSBundleInfo.plist.in
@@ -51,6 +51,7 @@
                 <string>LaunchScreen</string>
                 <key>UIAppFonts</key>
                 <array>
+                        <string>IosevkaTerm-Extended.ttf</string>
                         <string>SourceSans3-Regular.ttf</string>
                 </array>
                 <key>UIBackgroundModes</key>
diff --git a/src/ios.m b/src/ios.m
index 47303b7f..559316a2 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -811,14 +811,18 @@ int preferredHeight_SystemTextInput(const iSystemTextInput *d) {
 void setFont_SystemTextInput(iSystemTextInput *d, int fontId) {
     float height = lineHeight_Text(fontId) / get_Window()->pixelRatio;
     UIFont *font;
+    //        for (NSString *name in [UIFont familyNames]) {
+    //            printf("family: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    //        }
     if (fontId / maxVariants_Fonts * maxVariants_Fonts == monospace_FontId) {
-        font = [UIFont monospacedSystemFontOfSize:0.8f * height weight:UIFontWeightRegular];
+//        font = [UIFont monospacedSystemFontOfSize:0.8f * height weight:UIFontWeightRegular];
+//        for (NSString *name in [UIFont fontNamesForFamilyName:@"Iosevka Term"]) {
+//            printf("fontname: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
+//        }
+        font = [UIFont fontWithName:@"Iosevka-Term-Extended" size:height * 0.8f];
     }
     else {
 //        font = [UIFont systemFontOfSize:0.65f * height];
-//        for (NSString *name in [UIFont fontNamesForFamilyName:@"Source Sans 3"]) {
-//            printf("fontname: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
-//        }
         font = [UIFont fontWithName:@"SourceSans3-Regular" size:height * 0.7f];
     }
     if (d->field) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 3572d043..d62bc77e 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -711,10 +711,11 @@ static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, iBool doStart)
 static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
     /* Rewrap the buffered text and resize accordingly. */
     iWrapText wt = wrap_InputWidget_(d, 0);
+    /* TODO: Set max lines limit for WrapText. */
     const int height = measure_WrapText(&wt, d->font).bounds.size.y;
     /* We use this to store the number wrapped lines for determining widget height. */
     d->visWrapLines.start = 0;
-    d->visWrapLines.end = height / lineHeight_Text(d->font);
+    d->visWrapLines.end = iMin(d->maxWrapLines, height / lineHeight_Text(d->font));
     updateMetrics_InputWidget_(d);
 }