4 files changed, 23 insertions, 3 deletions

diff --git a/src/ios.m b/src/ios.m
index 69e09419..82596ffd 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "audio/player.h"
 #include "ui/command.h"
 #include "ui/window.h"
+#include "ui/touch.h"
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
@@ -541,7 +542,18 @@ static void openActivityView_(NSArray *activityItems) {
         [[UIActivityViewController alloc]
          initWithActivityItems:activityItems
          applicationActivities:nil];
-    [viewController_(get_Window()) presentViewController:actView animated:YES completion:nil];
+    iWindow *win = get_Window();
+    UIViewController *viewCtl = viewController_(win);
+    UIPopoverPresentationController *popover = [actView popoverPresentationController];
+    if (popover) {
+        [popover setSourceView:[viewCtl view]];
+        iInt2 tapPos = latestTapPosition_Touch();
+        tapPos.x /= win->pixelRatio;
+        tapPos.y /= win->pixelRatio;
+        [popover setSourceRect:(CGRect){{tapPos.x - 10, tapPos.y - 10}, {20, 20}}];
+        [popover setCanOverlapSourceViewRect:YES];
+    }
+    [viewCtl presentViewController:actView animated:YES completion:nil];
 }
 
 void openTextActivityView_iOS(const iString *text) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index e63e4636..2bce16e8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -5267,14 +5267,15 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             destroy_Widget(d->copyMenu);
                             d->copyMenu = NULL;
                         }
-                        d->copyMenu = makeMenu_Widget(w, (iMenuItem[]){
+                        const iMenuItem items[] = {
                             { clipCopy_Icon " ${menu.copy}", 0, 0, "copy" },
 #if defined (iPlatformAppleMobile)
                             { export_Icon " ${menu.share}", 0, 0, "copy share:1" },
 #endif
                             { "---" },
                             { close_Icon " ${menu.select.clear}", 0, 0, "document.select arg:0" },
-                        }, 3);
+                        };
+                        d->copyMenu = makeMenu_Widget(w, items, iElemCount(items));
                         setFlags_Widget(d->copyMenu, noFadeBackground_WidgetFlag, iTrue);
                         openMenu_Widget(d->copyMenu, pos_Click(&d->click));
                         return iTrue;
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 3d318dfb..20ccf7b8 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -111,6 +111,7 @@ struct Impl_TouchState {
     double momFrictionPerStep;
     double lastMomTime;
     iInt2 currentTouchPos; /* for emulating SDL_GetMouseState() */
+    iInt2 latestLongPressStartPos;
 };
 
 static iTouchState *touchState_(void) {
@@ -313,6 +314,7 @@ static void update_TouchState_(void *ptr) {
             }
             if (!touch->isTapAndHold && nowTime - touch->startTime >= longPressSpanMs_ &&
                 touch->affinity) {
+                touchState_()->latestLongPressStartPos = initF3_I2(touch->pos[0]);
                 dispatchClick_Touch_(touch, SDL_BUTTON_RIGHT);
                 touch->isTapAndHold = iTrue;
                 touch->hasMoved = iFalse;
@@ -838,6 +840,10 @@ iInt2 latestPosition_Touch(void) {
     return touchState_()->currentTouchPos;
 }
 
+iInt2 latestTapPosition_Touch(void) {
+    return touchState_()->latestLongPressStartPos;
+}
+
 iBool isHovering_Touch(void) {
     iTouchState *d = touchState_();
     if (numFingers_Touch() == 1) {
diff --git a/src/ui/touch.h b/src/ui/touch.h
index 9c45fcb1..15c6da1f 100644
--- a/src/ui/touch.h
+++ b/src/ui/touch.h
@@ -42,5 +42,6 @@ void                    widgetDestroyed_Touch       (iWidget *widget);
 void                    transferAffinity_Touch      (iWidget *src, iWidget *dst);
 
 iInt2   latestPosition_Touch    (void); /* valid during processing of current event */
+iInt2   latestTapPosition_Touch (void);
 iBool   isHovering_Touch        (void); /* stationary touch or a long-press drag ongoing */
 size_t  numFingers_Touch        (void);