Mobile: Find on page, various minor tweaks

On mobile, the search bar appears at the top of the page.

Keep the haptic engine running so there is no delay before each effect.

After a long-press, remove the "mouse" from the display area so there is no misleading hover.

Widget border top/bottom use metrics.

7 files changed, 37 insertions, 17 deletions

diff --git a/src/defs.h b/src/defs.h
index 41bf340e..eb8affec 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -80,3 +80,5 @@ enum iFileVersion {
 #define clipCopy_Icon       "\u2398"
 #define clipboard_Icon      "\U0001f4cb"
 #define unhappy_Icon        "\U0001f641"
+#define globe_Icon          "\U0001f310"
+#define magnifyingGlass_Icon    "\U0001f50d"
diff --git a/src/ios.m b/src/ios.m
index 75824117..5b811a57 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -106,9 +106,10 @@ API_AVAILABLE(ios(13.0))
     // TODO: Check the error.
     [self.engine startWithCompletionHandler:^(NSError *err){
         if (err == nil) {
-            [self.engine notifyWhenPlayersFinished:^(NSError * _Nullable error) {
-                return CHHapticEngineFinishedActionStopEngine;
-            }];
+            /* Just keep it running. */
+//            [self.engine notifyWhenPlayersFinished:^(NSError * _Nullable error) {
+//                return CHHapticEngineFinishedActionStopEngine;
+//            }];
             NSError *startError = nil;
             [player startAtTime:0.0 error:&startError];
         }
@@ -135,6 +136,9 @@ static AppState *appState_;
             HapticState *hs = [[HapticState alloc] init];
             [hs setup];
             self.haptic = hs;
+            /* We start the engine and keep it running. */
+            NSError *err;
+            [hs.engine startAndReturnError:&err];
         }
     } else {
         self.isHapticsAvailable = NO;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a468e2df..6df25433 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2526,8 +2526,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             &items,
                             (iMenuItem[]){
                                 { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
-                            { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" } },
-                        2);
+                                { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" } },
+                            2);
                     }
                     pushBackN_Array(
                         &items,
@@ -2542,10 +2542,15 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { star_Icon " Subscribe to Page...", subscribeToPage_KeyModifier, "feeds.subscribe" },
                             { "---", 0, 0, NULL },
                             { book_Icon " Import Links as Bookmarks...", 0, 0, "bookmark.links confirm:1" },
-                            { "Translate...", 0, 0, "document.translate" },
+                            { globe_Icon " Translate...", 0, 0, "document.translate" },
                             { "---", 0, 0, NULL },
                             { "Copy Page URL", 0, 0, "document.copylink" } },
                         12);
+                    if (deviceType_App() != desktop_AppDeviceType) {
+                        /* TODO: Perhaps not the best place for this? */
+                        insert_Array(&items, size_Array(&items) - 3,
+                                     &(iMenuItem){ magnifyingGlass_Icon " Find on page", 0, 0, "focus.set id:find.input" });
+                    }
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 8866fb43..c369c5a5 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -56,6 +56,7 @@ struct Impl_Touch {
     iWidget *affinity; /* widget on which the touch started */
     iWidget *edgeDragging;
     iBool hasMoved;
+    iBool isTapBegun;
     iBool isTouchDrag;
     iBool isTapAndHold;
     enum iTouchEdge edge;
@@ -151,7 +152,6 @@ static iBool dispatchClick_Touch_(const iTouch *d, int button) {
     btn.state = SDL_RELEASED;
     btn.timestamp = SDL_GetTicks();
     dispatchEvent_Widget(window->root, (SDL_Event *) &btn);
-    setHover_Widget(NULL); /* FIXME: this doesn't seem to do anything? */
     if (!wasUsed && button == SDL_BUTTON_RIGHT) {
         postContextClick_Window(window, &btn);
     }
@@ -180,9 +180,10 @@ static void update_TouchState_(void *ptr) {
             if (elapsed > 25) {
                 clearWidgetMomentum_TouchState_(d, touch->affinity);
             }
-            if (elapsed > 50) {
+            if (elapsed > 50 && !touch->isTapBegun) {
                 /* Looks like a possible tap. */
                 dispatchMotion_Touch_(touch->pos[0], 0);
+                touch->isTapBegun = iTrue;
             }
             if (!touch->isTapAndHold && nowTime - touch->startTime >= longPressSpanMs_ &&
                 touch->affinity) {
@@ -193,6 +194,7 @@ static void update_TouchState_(void *ptr) {
 #if defined (iPlatformAppleMobile)
                 playHapticEffect_iOS(tap_HapticEffect);
 #endif
+                dispatchMotion_Touch_(init_F3(-100, -100, 0), 0);
             }
         }
     }
@@ -535,6 +537,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 if (duration < longPressSpanMs_ && isStationary_Touch_(touch)) {
                     dispatchMotion_Touch_(pos, SDL_BUTTON_LMASK);
                     dispatchClick_Touch_(touch, SDL_BUTTON_LEFT);
+                    dispatchMotion_Touch_(init_F3(-100, -100, 0), 0); /* out of screen */
                 }
                 else if (length_F3(velocity) > 0.0f) {
     //                printf("vel:%f\n", length_F3(velocity));
diff --git a/src/ui/util.c b/src/ui/util.c
index 9d75129e..18ed7ba2 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1060,7 +1060,6 @@ static iWidget *makeValuePadding_(iWidget *value) {
     setPadding_Widget(pad, 0, 1 * gap_UI, 0, 1 * gap_UI);
     addChild_Widget(pad, iClob(value));
     setFlags_Widget(pad,
-                    borderTop_WidgetFlag |
                     borderBottom_WidgetFlag |
                     arrangeVertical_WidgetFlag |
                     resizeToParentWidth_WidgetFlag |
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 6a6480e5..8641dd61 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -871,12 +871,15 @@ void drawBackground_Widget(const iWidget *d) {
         const iRect rect = bounds_Widget(d);
         iPaint p;
         init_Paint(&p);
+        const int hgt = gap_UI / 4;
         if (d->flags & borderTop_WidgetFlag) {
-            drawHLine_Paint(&p, topLeft_Rect(rect), width_Rect(rect),
+            fillRect_Paint(&p, (iRect){ topLeft_Rect(rect),
+                                        init_I2(width_Rect(rect), hgt) },
                             uiBackgroundFramelessHover_ColorId);
         }
         if (d->flags & borderBottom_WidgetFlag) {
-            drawHLine_Paint(&p, addY_I2(bottomLeft_Rect(rect), -1), width_Rect(rect),
+            fillRect_Paint(&p, (iRect) { addY_I2(bottomLeft_Rect(rect), -hgt),
+                                         init_I2(width_Rect(rect), hgt) },
                             uiBackgroundFramelessHover_ColorId);
         }
     }
diff --git a/src/ui/window.c b/src/ui/window.c
index 29f240c2..2ef67142 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -218,8 +218,6 @@ static const iMenuItem tabletNavMenuItems_[] = {
     { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" },
     { close_Icon " Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
     { "---", 0, 0, NULL },
-    { download_Icon " Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
-    { "---", 0, 0, NULL },
     { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
@@ -240,8 +238,6 @@ static const iMenuItem phoneNavMenuItems_[] = {
     { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" },
     { close_Icon " Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
     { "---", 0, 0, NULL },
-    { download_Icon " Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
-    { "---", 0, 0, NULL },
     { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
@@ -1093,11 +1089,19 @@ static void setupUserInterface_Window(iWindow *d) {
                             arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
                             arrangeHorizontal_WidgetFlag,
                         iTrue);
-        addChild_Widget(div, iClob(searchBar));
+        if (deviceType_App() == desktop_AppDeviceType) {
+            addChild_Widget(div, iClob(searchBar));
+        }
+        else {
+            /* The search bar appears at the top on mobile, because there is a virtual keyboard
+               covering the bottom. */
+            insertChildAfter_Widget(div, iClob(searchBar),
+                                    childIndex_Widget(div, findChild_Widget(div, "navbar")));
+        }
         setBackgroundColor_Widget(searchBar, uiBackground_ColorId);
         setCommandHandler_Widget(searchBar, handleSearchBarCommands_);
         addChildFlags_Widget(
-            searchBar, iClob(new_LabelWidget("\U0001f50d Text", NULL)), frameless_WidgetFlag);
+            searchBar, iClob(new_LabelWidget(magnifyingGlass_Icon " Text", NULL)), frameless_WidgetFlag);
         iInputWidget *input = new_InputWidget(0);
         setSelectAllOnFocus_InputWidget(input, iTrue);
         setEatEscape_InputWidget(input, iFalse); /* unfocus and close with one keypress */