5 files changed, 127 insertions, 17 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a21d660d..8c707206 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1,4 +1,5 @@
 #include "documentwidget.h"
+#include "scrollwidget.h"
 #include "paint.h"
 #include "util.h"
 #include "app.h"
@@ -33,6 +34,7 @@ struct Impl_DocumentWidget {
     iPtrArray visibleLinks;
     const iGmRun *hoverLink;
     iClick click;
+    iScrollWidget *scroll;
 };
 
 iDeclareType(Url)
@@ -72,7 +74,6 @@ void init_DocumentWidget(iDocumentWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
     setId_Widget(w, "document");
-    setBackgroundColor_Widget(w, gray25_ColorId);
     d->state = blank_DocumentState;
     d->url = new_String();
     d->statusCode = 0;
@@ -84,6 +85,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     init_PtrArray(&d->visibleLinks);
     d->hoverLink = NULL;
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
+    addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
 }
 
 void deinit_DocumentWidget(iDocumentWidget *d) {
@@ -110,11 +112,13 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
     return rect;
 }
 
+#if 0
 void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
     /* TODO: lock source during update */
     setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
     d->state = ready_DocumentState;
 }
+#endif
 
 static iRangecc getLine_(iRangecc text) {
     iRangecc line = { text.start, text.start };
@@ -194,6 +198,12 @@ void setUrl_DocumentWidget(iDocumentWidget *d, const iString *url) {
     delete_String(newUrl);
 }
 
+static iRangei visibleRange_DocumentWidget_(const iDocumentWidget *d) {
+    const int margin = gap_UI * d->pageMargin;
+    return (iRangei){ d->scrollY - margin,
+                      d->scrollY + height_Rect(bounds_Widget(constAs_Widget(d))) - margin };
+}
+
 static void addVisibleLink_DocumentWidget_(void *context, const iGmRun *run) {
     iDocumentWidget *d = context;
     if (run->linkId) {
@@ -201,19 +211,21 @@ static void addVisibleLink_DocumentWidget_(void *context, const iGmRun *run) {
     }
 }
 
-static iRangei visibleRange_DocumentWidget_(const iDocumentWidget *d) {
-    const int margin = gap_UI * d->pageMargin;
-    return (iRangei){ d->scrollY - margin,
-                      d->scrollY + height_Rect(bounds_Widget(constAs_Widget(d))) - margin };
+static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
+    return size_GmDocument(d->doc).y - height_Rect(bounds_Widget(constAs_Widget(d))) +
+           2 * d->pageMargin * gap_UI;
 }
 
 static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
+    const iRangei visRange = visibleRange_DocumentWidget_(d);
+    const iRect   bounds   = bounds_Widget(as_Widget(d));
+    setRange_ScrollWidget(d->scroll, (iRangei){ 0, scrollMax_DocumentWidget_(d) });
+    const int docSize = size_GmDocument(d->doc).y;
+    setThumb_ScrollWidget(d->scroll,
+                          d->scrollY,
+                          docSize > 0 ? height_Rect(bounds) * size_Range(&visRange) / docSize : 0);
     clear_PtrArray(&d->visibleLinks);
-    render_GmDocument(
-        d->doc,
-        visibleRange_DocumentWidget_(d),
-        addVisibleLink_DocumentWidget_,
-        d);
+    render_GmDocument(d->doc, visRange, addVisibleLink_DocumentWidget_, d);
 }
 
 static iRangecc dirPath_(iRangecc path) {
@@ -300,8 +312,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         if (d->scrollY < 0) {
             d->scrollY = 0;
         }
-        const int scrollMax =
-            size_GmDocument(d->doc).y - height_Rect(bounds_Widget(w)) + 2 * d->pageMargin * gap_UI;
+        const int scrollMax = scrollMax_DocumentWidget_(d);
         if (scrollMax > 0) {
             d->scrollY = iMin(d->scrollY, scrollMax);
         }
@@ -377,21 +388,25 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     draw_Widget(w);
     /* Update the document? */
     if (!isEmpty_String(d->newSource)) {
+        iDocumentWidget *m = iConstCast(iDocumentWidget *, d);
         /* TODO: Do this in the background. However, that requires a text metrics calculator
            that does not try to cache the glyph bitmaps. */
-        setSource_GmDocument(d->doc, d->newSource, documentWidth_DocumentWidget_(d));
-        clear_String(d->newSource);
-        iConstCast(iDocumentWidget *, d)->state = ready_DocumentState;
-        updateVisible_DocumentWidget_(iConstCast(iDocumentWidget *, d));
+        setSource_GmDocument(m->doc, m->newSource, documentWidth_DocumentWidget_(m));
+        clear_String(m->newSource);
+        m->scrollY = 0;
+        m->state = ready_DocumentState;
+        updateVisible_DocumentWidget_(m);
     }
     if (d->state != ready_DocumentState) return;
     iDrawContext ctx = { .widget = d, .bounds = documentBounds_DocumentWidget_(d) };
     init_Paint(&ctx.paint);
+    fillRect_Paint(&ctx.paint, bounds_Widget(w), gray25_ColorId);
     render_GmDocument(
         d->doc,
         visibleRange_DocumentWidget_(d),
         drawRun_DrawContext_,
         &ctx);
+    draw_Widget(w);
 }
 
 iBeginDefineSubclass(DocumentWidget, Widget)
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
new file mode 100644
index 00000000..cbfd2e70
--- /dev/null
+++ b/src/ui/scrollwidget.c
@@ -0,0 +1,79 @@
+#include "scrollwidget.h"
+#include "paint.h"
+
+iDefineObjectConstruction(ScrollWidget)
+
+struct Impl_ScrollWidget {
+    iWidget widget;
+    iRangei range;
+    int thumb;
+    int thumbSize;
+};
+
+void init_ScrollWidget(iScrollWidget *d) {
+    iWidget *w = as_Widget(d);
+    init_Widget(w);
+    setId_Widget(w, "scroll");
+    setFlags_Widget(w,
+                    fixedWidth_WidgetFlag | resizeToParentHeight_WidgetFlag |
+                        moveToParentRightEdge_WidgetFlag,
+                    iTrue);
+    w->rect.size.x = gap_UI * 3;
+}
+
+void deinit_ScrollWidget(iScrollWidget *d) {
+    iUnused(d);
+}
+
+static iRect thumbRect_ScrollWidget_(const iScrollWidget *d) {
+    const iRect bounds = bounds_Widget(constAs_Widget(d));
+    iRect rect = init_Rect(bounds.pos.x, bounds.pos.y, bounds.size.x, 0);
+    const int total = size_Range(&d->range);
+//    printf("total: %d  thumb: %d  thsize: %d\n", total, d->thumb, d->thumbSize); fflush(stdout);
+    if (total > 0) {
+        const int tsize = iMax(gap_UI * 6, d->thumbSize);
+        const int tpos =
+            iClamp((float) d->thumb / (float) total, 0, 1) * (height_Rect(bounds) - tsize);
+        rect.pos.y  = tpos;
+        rect.size.y = tsize;
+    }
+    return rect;
+}
+
+static void checkVisible_ScrollWidget_(iScrollWidget *d) {
+    setFlags_Widget(as_Widget(d), hidden_WidgetFlag, height_Rect(thumbRect_ScrollWidget_(d)) == 0);
+}
+
+void setRange_ScrollWidget(iScrollWidget *d, iRangei range) {
+    range.end = iMax(range.start, range.end);
+    d->range = range;
+    checkVisible_ScrollWidget_(d);
+}
+
+void setThumb_ScrollWidget(iScrollWidget *d, int thumb, int thumbSize) {
+    d->thumb     = thumb;
+    d->thumbSize = thumbSize;
+    checkVisible_ScrollWidget_(d);
+}
+
+static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
+    iWidget *w = as_Widget(d);
+    return processEvent_Widget(w, ev);
+}
+
+static void draw_ScrollWidget_(const iScrollWidget *d) {
+    const iWidget *w = constAs_Widget(d);
+    const iRect bounds = bounds_Widget(w);
+    if (bounds.size.x > 0) {
+        iPaint p;
+        init_Paint(&p);
+        drawRect_Paint(&p, bounds, black_ColorId);
+        iRect tr = thumbRect_ScrollWidget_(d);
+        fillRect_Paint(&p, thumbRect_ScrollWidget_(d), gray50_ColorId);
+    }
+}
+
+iBeginDefineSubclass(ScrollWidget, Widget)
+    .processEvent = (iAny *) processEvent_ScrollWidget_,
+    .draw         = (iAny *) draw_ScrollWidget_,
+iEndDefineSubclass(ScrollWidget)
diff --git a/src/ui/scrollwidget.h b/src/ui/scrollwidget.h
new file mode 100644
index 00000000..7b44dced
--- /dev/null
+++ b/src/ui/scrollwidget.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "widget.h"
+#include <the_Foundation/range.h>
+
+iDeclareWidgetClass(ScrollWidget)
+iDeclareObjectConstruction(ScrollWidget)
+
+void    setRange_ScrollWidget   (iScrollWidget *, iRangei range);
+void    setThumb_ScrollWidget   (iScrollWidget *, int thumb, int thumbSize);
+
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 49fcd7c0..5c23860f 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -150,6 +150,9 @@ static void setHeight_Widget_(iWidget *d, int height) {
 }
 
 void arrange_Widget(iWidget *d) {
+    if (d->flags & moveToParentRightEdge_WidgetFlag) {
+        d->rect.pos.x = width_Rect(d->parent->rect) - width_Rect(d->rect);
+    }
     if (d->flags & resizeToParentWidth_WidgetFlag) {
         setWidth_Widget_(d, d->parent->rect.size.x);
     }
@@ -250,7 +253,8 @@ void arrange_Widget(iWidget *d) {
             /* Parent size changed, must update the children.*/
             iForEach(ObjectList, j, d->children) {
                 iWidget *child = as_Widget(j.object);
-                if (child->flags & resizeToParentWidth_WidgetFlag) {
+                if (child->flags &
+                    (resizeToParentWidth_WidgetFlag | moveToParentRightEdge_WidgetFlag)) {
                     arrange_Widget(child);
                 }
             }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index bf5c22f1..2d13fe78 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -46,6 +46,7 @@ enum iWidgetFlag {
     resizeChildrenToWidestChild_WidgetFlag = iBit(25),
     resizeToParentWidth_WidgetFlag         = iBit(26),
     resizeToParentHeight_WidgetFlag        = iBit(27),
+    moveToParentRightEdge_WidgetFlag       = iBit(28),
 };
 
 enum iWidgetAddPos {