iOS: Minor fixes

The SDL text input rectangle function applies some sort of offset that is inappropriate on iOS.

4 files changed, 18 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3793eea..78b78562 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ project (Lagrange
 set (COPYRIGHT_YEAR 2021)
 if (IOS)
     set (PROJECT_VERSION 1.4)  # pinned for TestFlight
-    set (IOS_BUNDLE_VERSION 21.9.4)
+    set (IOS_BUNDLE_VERSION 21.9.5)
 endif ()
 
 # Default that depend on environment.
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 76e843d5..e280bc84 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -3676,10 +3676,16 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { "---", 0, 0, NULL },
                             { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                             { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+#if defined (iPlatformMobile)
+                            { "---", 0, 0, NULL },
+                            { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
+                        14);
+#else
                             { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
                             { "---", 0, 0, NULL },
                             { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
                         15);
+#endif
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 690107a2..f1b21922 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -542,8 +542,10 @@ static int contentHeight_InputWidget_(const iInputWidget *d) {
 }
 
 static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
+#if !defined (iPlatformAppleMobile)
     const iRect bounds = bounds_Widget(constAs_Widget(d));
-    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });    
+    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });
+#endif
 }
 
 static void updateMetrics_InputWidget_(iInputWidget *d) {
diff --git a/src/ui/root.c b/src/ui/root.c
index a72f002c..0b55d250 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1163,12 +1163,20 @@ void createUserInterface_Root(iRoot *d) {
                         { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
                         { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                         { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+#if defined (iPlatformMobile)
+                        { "---", 0, 0, NULL },
+                        { "${menu.page.copyurl}", 0, 0, "document.copylink" },
+                        { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
+                        { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
+                    11);
+#else
                         { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
                         { "---", 0, 0, NULL },
                         { "${menu.page.copyurl}", 0, 0, "document.copylink" },
                         { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
                         { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
                     12);
+#endif
                 setId_Widget(as_Widget(pageMenuButton), "pagemenubutton");
                 setFont_LabelWidget(pageMenuButton, uiContentBold_FontId);
                 setAlignVisually_LabelWidget(pageMenuButton, iTrue);