SidebarWidget: Scroll view to newly added items

New bookmarks and folders shouldn't appear outside the visible part of the list.

6 files changed, 28 insertions, 7 deletions

diff --git a/src/app.c b/src/app.c
index 3db5cabe..df4a8b0d 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2794,7 +2794,7 @@ iBool handleCommand_App(const char *cmd) {
             if (parentId) {
                 get_Bookmarks(d->bookmarks, id)->parentId = parentId;
             }
-            postCommand_App("bookmarks.changed");
+            postCommandf_App("bookmarks.changed added:%zu", id);
         }
         else {
             iWidget *dlg = makeValueInput_Widget(
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 6bb53f2b..3360d71e 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -206,7 +206,11 @@ void scrollOffset_ListWidget(iListWidget *d, int offset) {
     moveSpan_SmoothScroll(&d->scrollY, offset, 0);
 }
 
-void scrollToItem_ListWidget(iListWidget *d, size_t index) {
+void scrollOffsetSpan_ListWidget(iListWidget *d, int offset, uint32_t span) {
+    moveSpan_SmoothScroll(&d->scrollY, offset, span);
+}
+
+void scrollToItem_ListWidget(iListWidget *d, size_t index, uint32_t span) {
     if (index >= size_PtrArray(&d->items)) {
         return;
     }
@@ -215,10 +219,10 @@ void scrollToItem_ListWidget(iListWidget *d, size_t index) {
     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));
+        scrollOffsetSpan_ListWidget(d, yBottom - height_Rect(rect), span);
     }
     else if (yTop < 0) {
-        scrollOffset_ListWidget(d, yTop);
+        scrollOffsetSpan_ListWidget(d, yTop, span);
     }
 }
 
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index dfa24c07..8adf6ac3 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -62,8 +62,9 @@ int     itemHeight_ListWidget       (const iListWidget *);
 int     scrollPos_ListWidget        (const iListWidget *);
 
 void    setScrollPos_ListWidget     (iListWidget *, int pos);
-void    scrollToItem_ListWidget     (iListWidget *, size_t index);
+void    scrollToItem_ListWidget     (iListWidget *, size_t index, uint32_t span);
 void    scrollOffset_ListWidget     (iListWidget *, int offset);
+void    scrollOffsetSpan_ListWidget (iListWidget *, int offset, uint32_t span);
 void    updateVisible_ListWidget    (iListWidget *);
 void    updateMouseHover_ListWidget (iListWidget *);
 void    setHoverItem_ListWidget     (iListWidget *, size_t index);
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index ab649eee..e57a5fdc 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -624,7 +624,7 @@ static void setCursor_LookupWidget_(iLookupWidget *d, size_t index) {
             item->listItem.isSelected = iTrue;
             invalidateItem_ListWidget(d->list, d->cursor);
         }
-        scrollToItem_ListWidget(d->list, d->cursor);
+        scrollToItem_ListWidget(d->list, d->cursor, 0);
     }
 }
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 4d229c59..4b772eeb 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -628,6 +628,17 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
     updateMouseHover_ListWidget(d->list);
 }
 
+static size_t findItem_SidebarWidget_(const iSidebarWidget *d, int id) {
+    /* Note that this is O(n), so only meant for infrequent use. */
+    for (size_t i = 0; i < numItems_ListWidget(d->list); i++) {
+        const iSidebarItem *item = constItem_ListWidget(d->list, i);
+        if (item->id == id) {
+            return i;
+        }
+    }
+    return iInvalidPos;
+}
+
 static void updateItemHeight_SidebarWidget_(iSidebarWidget *d) {
     if (d->list) {
         const float heights[max_SidebarMode] = { 1.333f, 2.333f, 1.333f, 3.5f, 1.2f };
@@ -1188,6 +1199,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                                              d->mode == feeds_SidebarMode)) {
             if (pointerLabel_Command(cmd, "nosidebar") != d) {
                 updateItems_SidebarWidget_(d);
+                if (hasLabel_Command(cmd, "added")) {
+                    const size_t addedId    = argLabel_Command(cmd, "added");
+                    const size_t addedIndex = findItem_SidebarWidget_(d, addedId);
+                    scrollToItem_ListWidget(d->list, addedIndex, 200);
+                }
             }
         }
         else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 80bd5d44..adca6269 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2694,7 +2694,7 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
                 addTag_Bookmark(bm, linkSplit_BookmarkTag);
             }
-            postCommand_App("bookmarks.changed");
+            postCommandf_App("bookmarks.changed added:%zu", id);
         }
         setupSheetTransition_Mobile(editor, iFalse);
         destroy_Widget(editor);