1 files changed, 52 insertions, 5 deletions

diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index cbfd2e70..1be62bb8 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -1,5 +1,6 @@
 #include "scrollwidget.h"
 #include "paint.h"
+#include "util.h"
 
 iDefineObjectConstruction(ScrollWidget)
 
@@ -8,6 +9,8 @@ struct Impl_ScrollWidget {
     iRangei range;
     int thumb;
     int thumbSize;
+    iClick click;
+    int startThumb;
 };
 
 void init_ScrollWidget(iScrollWidget *d) {
@@ -19,19 +22,23 @@ void init_ScrollWidget(iScrollWidget *d) {
                         moveToParentRightEdge_WidgetFlag,
                     iTrue);
     w->rect.size.x = gap_UI * 3;
+    init_Click(&d->click, d, SDL_BUTTON_LEFT);
 }
 
 void deinit_ScrollWidget(iScrollWidget *d) {
     iUnused(d);
 }
 
+static int thumbSize_ScrollWidget_(const iScrollWidget *d) {
+    return iMax(gap_UI * 6, d->thumbSize);
+}
+
 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 tsize = thumbSize_ScrollWidget_(d);
         const int tpos =
             iClamp((float) d->thumb / (float) total, 0, 1) * (height_Rect(bounds) - tsize);
         rect.pos.y  = tpos;
@@ -46,7 +53,7 @@ static void checkVisible_ScrollWidget_(iScrollWidget *d) {
 
 void setRange_ScrollWidget(iScrollWidget *d, iRangei range) {
     range.end = iMax(range.start, range.end);
-    d->range = range;
+    d->range  = range;
     checkVisible_ScrollWidget_(d);
 }
 
@@ -58,18 +65,58 @@ void setThumb_ScrollWidget(iScrollWidget *d, int thumb, int thumbSize) {
 
 static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
+    switch (processEvent_Click(&d->click, ev)) {
+        case started_ClickResult:
+            setFlags_Widget(w, pressed_WidgetFlag, iTrue);
+            d->startThumb = d->thumb;
+            refresh_Widget(w);
+            return iTrue;
+        case drag_ClickResult: {
+            const iRect bounds = bounds_Widget(w);
+            const int offset = delta_Click(&d->click).y;
+            const int total = size_Range(&d->range);
+            int dpos = (float) offset / (float) (height_Rect(bounds) - thumbSize_ScrollWidget_(d)) * total;
+            d->thumb = iClamp(d->startThumb + dpos, d->range.start, d->range.end);
+            postCommand_Widget(w, "scroll.moved arg:%d", d->thumb);
+            refresh_Widget(w);
+            return iTrue;
+        }
+        case finished_ClickResult:
+        case aborted_ClickResult:
+            if (!isMoved_Click(&d->click)) {
+                /* Page up/down. */
+                const iRect tr = thumbRect_ScrollWidget_(d);
+                const int y = pos_Click(&d->click).y;
+                int pgDir = 0;
+                if (y < top_Rect(tr)) {
+                    pgDir = -1;
+                }
+                else if (y > bottom_Rect(tr)) {
+                    pgDir = +1;
+                }
+                if (pgDir) {
+                    postCommand_Widget(w, "scroll.page arg:%d", pgDir);
+                }
+            }
+            setFlags_Widget(w, pressed_WidgetFlag, iFalse);
+            refresh_Widget(w);
+            return iTrue;
+        default:
+            break;
+    }
     return processEvent_Widget(w, ev);
 }
 
 static void draw_ScrollWidget_(const iScrollWidget *d) {
     const iWidget *w = constAs_Widget(d);
     const iRect bounds = bounds_Widget(w);
+    const iBool isPressed = (flags_Widget(w) & pressed_WidgetFlag) != 0;
     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);
+        fillRect_Paint(&p, shrunk_Rect(thumbRect_ScrollWidget_(d), one_I2()),
+                       isPressed ? orange_ColorId : gray50_ColorId);
     }
 }