5 files changed, 32 insertions, 11 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 3192acd5..05ec5141 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -411,6 +411,19 @@ iRangecc findText_GmDocument(const iGmDocument *d, const iString *text, const ch
     return (iRangecc){ src + pos, src + pos + size_String(text) };
 }
 
+iRangecc findTextBefore_GmDocument(const iGmDocument *d, const iString *text, const char *before) {
+    iRangecc found = iNullRange;
+    const char *start = constBegin_String(&d->source);
+    if (!before) before = constEnd_String(&d->source);
+    while (start < before) {
+        iRangecc range = findText_GmDocument(d, text, start);
+        if (range.start == NULL || range.start >= before) break;
+        found = range;
+        start = range.end;
+    }
+    return found;
+}
+
 const iGmRun *findRun_GmDocument(const iGmDocument *d, iInt2 pos) {
     /* TODO: Perf optimization likely needed; use a block map? */
     iConstForEach(Array, i, &d->layout) {
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 01ade5d3..6972d328 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -28,7 +28,9 @@ typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 void    render_GmDocument       (const iGmDocument *, iRangei visRangeY, iGmDocumentRenderFunc render, void *);
 iInt2   size_GmDocument         (const iGmDocument *);
 
-iRangecc        findText_GmDocument     (const iGmDocument *, const iString *text, const char *start);
+iRangecc        findText_GmDocument         (const iGmDocument *, const iString *text, const char *start);
+iRangecc        findTextBefore_GmDocument   (const iGmDocument *, const iString *text, const char *before);
+
 const iGmRun *  findRun_GmDocument      (const iGmDocument *, iInt2 pos);
 const iGmRun *  findRunCStr_GmDocument  (const iGmDocument *, const char *textCStr);
 const iString * linkUrl_GmDocument      (const iGmDocument *, iGmLinkId linkId);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f7bfa39f..f0170924 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -417,27 +417,32 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             d, arg_Command(command_UserEvent(ev)) * height_Rect(documentBounds_DocumentWidget_(d)));
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "find.next")) {
+    else if (isCommand_UserEvent(ev, "find.next") || isCommand_UserEvent(ev, "find.prev")) {
+        const int dir = isCommand_UserEvent(ev, "find.next") ? +1 : -1;
+        iRangecc (*finder)(const iGmDocument *, const iString *, const char *) =
+            dir > 0 ? findText_GmDocument : findTextBefore_GmDocument;
         iInputWidget *find = findWidget_App("find.input");
         if (isEmpty_String(text_InputWidget(find))) {
             d->foundMark = iNullRange;
         }
         else {
             const iBool wrap = d->foundMark.start != NULL;
-            d->foundMark = findText_GmDocument(d->doc, text_InputWidget(find), d->foundMark.end);
+            d->foundMark     = finder(
+                d->doc, text_InputWidget(find), dir > 0 ? d->foundMark.end : d->foundMark.start);
             if (!d->foundMark.start && wrap) {
-                d->foundMark = findText_GmDocument(d->doc, text_InputWidget(find), 0);
+                /* Wrap around */
+                d->foundMark = finder(d->doc, text_InputWidget(find), NULL);
             }
             if (d->foundMark.start) {
-                iGmRun *run = findRunCStr_GmDocument(d->doc, d->foundMark.start);
-                if (run) {
-                    scrollTo_DocumentWidget_(d, mid_Rect(run->bounds).y);
+                const iGmRun *found;
+                if ((found = findRunCStr_GmDocument(d->doc, d->foundMark.start)) != NULL) {
+                    scrollTo_DocumentWidget_(d, mid_Rect(found->bounds).y);
                 }
             }
         }
         refresh_Widget(w);
         return iTrue;
-    }
+    }   
     else if (isCommand_UserEvent(ev, "find.clearmark")) {
         if (d->foundMark.start) {
             d->foundMark = iNullRange;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 48b796bc..6b8545c3 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -47,6 +47,7 @@ enum iWidgetFlag {
     resizeToParentWidth_WidgetFlag         = iBit(26),
     resizeToParentHeight_WidgetFlag        = iBit(27),
     moveToParentRightEdge_WidgetFlag       = iBit(28),
+    collapse_WidgetFlag                    = iBit(29), /* when hidden, arrange size to zero */
 };
 
 enum iWidgetAddPos {
diff --git a/src/ui/window.c b/src/ui/window.c
index e340e305..4c140de2 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -183,9 +183,9 @@ static void setupUserInterface_Window(iWindow *d) {
         addChild_Widget(searchBar, iClob(new_LabelWidget("\U0001f50d Text", 0, 0, NULL)));
         setId_Widget(addChildFlags_Widget(searchBar, iClob(new_InputWidget(0)), expand_WidgetFlag),
                      "find.input");
-        addChild_Widget(searchBar, iClob(new_LabelWidget("Next", 0, 0, "find.next")));
-        addChild_Widget(searchBar, iClob(new_LabelWidget("Previous", 0, 0, "find.prev")));
-        addChild_Widget(searchBar, iClob(new_LabelWidget("\u00d7", 0, 0, "find.close")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget("Next", 'g', KMOD_PRIMARY, "find.next")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget("Previous", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget("\u00d7", SDLK_ESCAPE, 0, "find.close")));
     }
 
 #if 0