iOS: Fixed text field position was shifting

The field was not tall enough, so it was scrolling slightly.

Some of the changes in InputWidget may have been unnecessary.

2 files changed, 8 insertions, 6 deletions

diff --git a/src/ios.m b/src/ios.m
index 6d0a8d0f..6a30c8a8 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -695,7 +695,7 @@ static CGRect convertToCGRect_(const iRect *rect, iBool expanded) {
         frame.origin.x -= inset + 1;
         frame.origin.y -= inset + 1;
         frame.size.width += 2 * inset + 2;
-        frame.size.height += inset + 1;
+        frame.size.height += inset + 1 + inset;
     }
     return frame;
 }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 1935826b..3bee3d21 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -722,18 +722,19 @@ static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
 #endif
 
 static int contentHeight_InputWidget_(const iInputWidget *d) {
+    const int lineHeight = lineHeight_Text(d->font);
 #if LAGRANGE_USE_SYSTEM_TEXT_INPUT
-    const int minHeight = d->minWrapLines * lineHeight_Text(d->font);
-    const int maxHeight = d->maxWrapLines * lineHeight_Text(d->font);
+    const int minHeight = d->minWrapLines * lineHeight;
+    const int maxHeight = d->maxWrapLines * lineHeight;
     if (d->sysCtrl) {
-        const int preferred = preferredHeight_SystemTextInput(d->sysCtrl);
-        return iClamp(preferred, minHeight, maxHeight);
+        const int preferred = (preferredHeight_SystemTextInput(d->sysCtrl) + gap_UI) / lineHeight;
+        return iClamp(preferred * lineHeight, minHeight, maxHeight);
     }
     if (d->buffered && ~d->inFlags & needUpdateBuffer_InputWidgetFlag) {
         return iClamp(d->buffered->size.y, minHeight, maxHeight);
     }
 #endif
-    return size_Range(&d->visWrapLines) * lineHeight_Text(d->font);
+    return (int) size_Range(&d->visWrapLines) * lineHeight;
 }
 
 static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
@@ -1178,6 +1179,7 @@ void begin_InputWidget(iInputWidget *d) {
     setText_SystemTextInput(d->sysCtrl, &d->oldText);
     setTextChangedFunc_SystemTextInput(d->sysCtrl, systemInputChanged_InputWidget_, d);
     iConnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
+    updateTextInputRect_InputWidget_(d);
     updateMetrics_InputWidget_(d);
 #else
     mergeLines_(&d->lines, &d->oldText);