ListWidget: Use SmoothScroll

4 files changed, 63 insertions, 30 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 1298dda9..853c25a9 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -3687,19 +3687,15 @@ static void drawMedia_DocumentWidget_(const iDocumentWidget *d, iPaint *p) {
 
 static void drawPin_(iPaint *p, iRect rangeRect, int dir) {
     const int pinColor = tmQuote_ColorId;
-    const int height = height_Rect(rangeRect);
+    const int height   = height_Rect(rangeRect);
     iRect pin;
     if (dir == 0) {
-        pin = (iRect){
-            add_I2(topLeft_Rect(rangeRect), init_I2(-gap_UI / 4, -gap_UI)),
-            init_I2(gap_UI / 2, height_Rect(rangeRect) + gap_UI)
-        };
+        pin = (iRect){ add_I2(topLeft_Rect(rangeRect), init_I2(-gap_UI / 4, -gap_UI)),
+                       init_I2(gap_UI / 2, height + gap_UI) };
     }
     else {
-        pin = (iRect){
-            addX_I2(topRight_Rect(rangeRect), -gap_UI / 4),
-            init_I2(gap_UI / 2, height_Rect(rangeRect) + gap_UI)
-        };
+        pin = (iRect){ addX_I2(topRight_Rect(rangeRect), -gap_UI / 4),
+                       init_I2(gap_UI / 2, height + gap_UI) };
     }
     fillRect_Paint(p, pin, pinColor);
     fillRect_Paint(p, initCentered_Rect(dir == 0 ? topMid_Rect(pin) : bottomMid_Rect(pin),
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 8690f8e5..0e2f9d7e 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -50,7 +50,8 @@ iDefineObjectConstruction(ListWidget)
 struct Impl_ListWidget {
     iWidget widget;
     iScrollWidget *scroll;
-    int scrollY;
+//    int scrollY;
+    iSmoothScroll scrollY;
     int itemHeight;
     iPtrArray items;
     size_t hoverItem;
@@ -60,6 +61,28 @@ struct Impl_ListWidget {
     iBool noHoverWhileScrolling;
 };
 
+static void refreshWhileScrolling_ListWidget_(iAnyObject *any) {
+    iListWidget *d = any;
+    updateVisible_ListWidget(d);
+    refresh_Widget(d);
+    if (!isFinished_SmoothScroll(&d->scrollY)) {
+        addTicker_App(refreshWhileScrolling_ListWidget_, any);
+    }
+}
+
+static void scrollBegan_ListWidget_(iAnyObject *any, int offset, uint32_t span) {
+    iListWidget *d = any;
+    iUnused(span);
+    if (offset) {
+        if (d->hoverItem != iInvalidPos) {
+            invalidateItem_ListWidget(d, d->hoverItem);
+            d->hoverItem = iInvalidPos;
+        }
+        d->noHoverWhileScrolling = iTrue;
+    }
+    refreshWhileScrolling_ListWidget_(d);
+}
+
 void init_ListWidget(iListWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -68,7 +91,7 @@ void init_ListWidget(iListWidget *d) {
     setFlags_Widget(w, hover_WidgetFlag, iTrue);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
     setThumb_ScrollWidget(d->scroll, 0, 0);
-    d->scrollY = 0;
+    init_SmoothScroll(&d->scrollY, w, scrollBegan_ListWidget_);
     d->itemHeight = 0;
     d->noHoverWhileScrolling = iFalse;
     init_PtrArray(&d->items);
@@ -79,6 +102,7 @@ void init_ListWidget(iListWidget *d) {
 }
 
 void deinit_ListWidget(iListWidget *d) {
+    removeTicker_App(refreshWhileScrolling_ListWidget_, d);
     clear_ListWidget(d);
     deinit_PtrArray(&d->items);
     delete_VisBuf(d->visBuf);
@@ -128,9 +152,10 @@ void updateVisible_ListWidget(iListWidget *d) {
     if (area_Rect(bounds) == 0) {
         return;
     }
-    setRange_ScrollWidget(d->scroll, (iRangei){ 0, scrollMax_ListWidget_(d) });
+    setMax_SmoothScroll(&d->scrollY, scrollMax_ListWidget_(d));
+    setRange_ScrollWidget(d->scroll, (iRangei){ 0, d->scrollY.max });
     setThumb_ScrollWidget(d->scroll,
-                          d->scrollY,
+                          pos_SmoothScroll(&d->scrollY),
                           contentSize > 0 ? height_Rect(bounds_Widget(as_Widget(d->scroll))) *
                                                 height_Rect(bounds) / contentSize
                                           : 0);
@@ -158,17 +183,19 @@ int itemHeight_ListWidget(const iListWidget *d) {
 }
 
 int scrollPos_ListWidget(const iListWidget *d) {
-    return d->scrollY;
+    return targetValue_Anim(&d->scrollY.pos);
 }
 
 void setScrollPos_ListWidget(iListWidget *d, int pos) {
-    d->scrollY = pos;
+//    d->scrollY = pos;
+    setValue_Anim(&d->scrollY.pos, pos, 0);
     d->hoverItem = iInvalidPos;
     refresh_Widget(as_Widget(d));
 }
 
-iBool scrollOffset_ListWidget(iListWidget *d, int offset) {
-    const int oldScroll = d->scrollY;
+void scrollOffset_ListWidget(iListWidget *d, int offset) {
+    moveSpan_SmoothScroll(&d->scrollY, offset, 0);
+    /*
     d->scrollY += offset;
     if (d->scrollY < 0) {
         d->scrollY = 0;
@@ -188,13 +215,14 @@ iBool scrollOffset_ListWidget(iListWidget *d, int offset) {
         updateVisible_ListWidget(d);
         refresh_Widget(as_Widget(d));
         return iTrue;
-    }
-    return iFalse;
+    }*/
+//    return iFalse;
 }
 
 void scrollToItem_ListWidget(iListWidget *d, size_t index) {
+    stop_Anim(&d->scrollY.pos);
     const iRect rect    = innerBounds_Widget(as_Widget(d));
-    int         yTop    = d->itemHeight * index - d->scrollY;
+    int         yTop    = d->itemHeight * index - pos_SmoothScroll(&d->scrollY);
     int         yBottom = yTop + d->itemHeight;
     if (yBottom > height_Rect(rect)) {
         scrollOffset_ListWidget(d, yBottom - height_Rect(rect));
@@ -222,7 +250,7 @@ static iRanges visRange_ListWidget_(const iListWidget *d) {
 
 size_t itemIndex_ListWidget(const iListWidget *d, iInt2 pos) {
     const iRect bounds = innerBounds_Widget(constAs_Widget(d));
-    pos.y -= top_Rect(bounds) - d->scrollY;
+    pos.y -= top_Rect(bounds) - pos_SmoothScroll(&d->scrollY);
     if (pos.y < 0 || !d->itemHeight) return iInvalidPos;
     size_t index = pos.y / d->itemHeight;
     if (index >= size_Array(&d->items)) return iInvalidPos;
@@ -304,6 +332,9 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
     if (isMetricsChange_UserEvent(ev)) {
         invalidate_ListWidget(d);
     }
+    else if (processEvent_SmoothScroll(&d->scrollY, ev)) {
+        return iTrue;
+    }
     else if (isCommand_SDLEvent(ev)) {
         const char *cmd = command_UserEvent(ev);
         if (equal_Command(cmd, "theme.changed")) {
@@ -325,10 +356,16 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
     }
     if (ev->type == SDL_MOUSEWHEEL && isHover_Widget(w)) {
         int amount = -ev->wheel.y;
-        if (!isPerPixel_MouseWheelEvent(&ev->wheel)) {
+        if (isPerPixel_MouseWheelEvent(&ev->wheel)) {
+            stop_Anim(&d->scrollY.pos);
+            moveSpan_SmoothScroll(&d->scrollY, amount, 0);
+        }
+        else {
+            /* Traditional mouse wheel. */
             amount *= 3 * d->itemHeight;
+            //if (!isFinished_SmoothScroll(&d->scrollY) && pos_Anim(&d->scrollY.pos) < 0.25f ? 0.5f : 1.0f)
+            moveSpan_SmoothScroll(&d->scrollY, amount, 200);            
         }
-        scrollOffset_ListWidget(d, amount);
         return iTrue;
     }
     switch (processEvent_Click(&d->click, ev)) {
@@ -360,6 +397,7 @@ static void draw_ListWidget_(const iListWidget *d) {
     if (!bounds.size.y || !bounds.size.x || !d->itemHeight) {
         return;
     }
+    const int scrollY = pos_SmoothScroll(&d->scrollY);
     iPaint p;
     init_Paint(&p);
     drawBackground_Widget(w);
@@ -375,8 +413,8 @@ static void draw_ListWidget_(const iListWidget *d) {
             w->bgColor, w->bgColor, w->bgColor, w->bgColor
         };
         const int bottom = numItems_ListWidget(d) * d->itemHeight;
-        const iRangei vis = { d->scrollY / d->itemHeight * d->itemHeight,
-                             ((d->scrollY + bounds.size.y) / d->itemHeight + 1) * d->itemHeight };
+        const iRangei vis = { scrollY / d->itemHeight * d->itemHeight,
+                             ((scrollY + bounds.size.y) / d->itemHeight + 1) * d->itemHeight };
         reposition_VisBuf(d->visBuf, vis);
         /* Check which parts are invalid. */
         iRangei invalidRange[iElemCount(d->visBuf->buffers)];
@@ -428,7 +466,7 @@ static void draw_ListWidget_(const iListWidget *d) {
         clear_IntSet(&iConstCast(iListWidget *, d)->invalidItems);
     }
     setClip_Paint(&p, bounds_Widget(w));
-    draw_VisBuf(d->visBuf, addY_I2(topLeft_Rect(bounds), -d->scrollY), ySpan_Rect(bounds));
+    draw_VisBuf(d->visBuf, addY_I2(topLeft_Rect(bounds), -scrollY), ySpan_Rect(bounds));
     unsetClip_Paint(&p);
     drawChildren_Widget(w);
 }
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index d7e2c55e..16adf664 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -61,7 +61,7 @@ int     scrollPos_ListWidget        (const iListWidget *);
 
 void    setScrollPos_ListWidget     (iListWidget *, int pos);
 void    scrollToItem_ListWidget     (iListWidget *, size_t index);
-iBool   scrollOffset_ListWidget     (iListWidget *, int offset); /* returns true if position changed */
+void    scrollOffset_ListWidget     (iListWidget *, int offset);
 void    updateVisible_ListWidget    (iListWidget *);
 void    updateMouseHover_ListWidget (iListWidget *);
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index cb084ccc..e7dcadde 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -426,9 +426,8 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
         default:
             break;
     }
-    if (!scrollOffset_ListWidget(d->list, 0)) {
-        updateVisible_ListWidget(d->list);
-    }
+    scrollOffset_ListWidget(d->list, 0);
+    updateVisible_ListWidget(d->list);
     invalidate_ListWidget(d->list);
     /* Content for a blank tab. */
     if (isEmpty) {