4 files changed, 77 insertions, 7 deletions

diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index d12afc4c..ccc5b104 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -87,6 +87,7 @@ void init_ListWidget(iListWidget *d) {
     d->hoverItem = iInvalidPos;
     d->dragItem = iInvalidPos;
     d->dragOrigin = zero_I2();
+    d->dragHandleWidth = 0;
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     init_IntSet(&d->invalidItems);
     d->visBuf = new_VisBuf();
@@ -192,6 +193,13 @@ void setScrollMode_ListWidget(iListWidget *d, enum iScrollMode mode) {
     d->scrollMode = mode;
 }
 
+void setDragHandleWidth_ListWidget(iListWidget *d, int dragHandleWidth) {
+    d->dragHandleWidth = dragHandleWidth;
+    if (dragHandleWidth == 0) {
+        setFlags_Widget(as_Widget(d), touchDrag_WidgetFlag, iFalse); /* mobile drag handles */
+    }
+}
+
 void scrollOffset_ListWidget(iListWidget *d, int offset) {
     moveSpan_SmoothScroll(&d->scrollY, offset, 0);
 }
@@ -353,6 +361,7 @@ static iBool endDrag_ListWidget_(iListWidget *d, iInt2 endPos) {
     if (d->dragItem == iInvalidPos) {
         return iFalse;
     }
+    setFlags_Widget(as_Widget(d), touchDrag_WidgetFlag, iFalse); /* mobile drag handles */
     stop_Anim(&d->scrollY.pos);
     enum iDragDestination dstKind;
     const size_t index = resolveDragDestination_ListWidget_(d, endPos, &dstKind);
@@ -441,6 +450,17 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
         }
     }
     if (ev->type == SDL_MOUSEWHEEL && isHover_Widget(w)) {
+        if (d->dragHandleWidth) {
+            if (d->dragItem == iInvalidPos) {
+                const iInt2 wpos = coord_MouseWheelEvent(&ev->wheel);
+                if (contains_Widget(w, wpos) &&
+                    wpos.x >= right_Rect(boundsWithoutVisualOffset_Widget(w)) - d->dragHandleWidth) {
+                    setFlags_Widget(w, touchDrag_WidgetFlag, iTrue);
+                    printf("[%p] touch drag started\n", d);
+                    return iTrue;
+                }
+            }
+        }
         if (isScrollDisabled_ListWidget_(d, ev)) {
             if (ev->wheel.which == SDL_TOUCH_MOUSEID) {
                 /* TODO: Could generalize this selection of the scrollable parent. */
@@ -498,7 +518,9 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
                 return iTrue;
             }
             redrawHoverItem_ListWidget_(d);
-            if (contains_Rect(itemRect_ListWidget(d, d->hoverItem), pos_Click(&d->click)) &&
+            if (contains_Rect(adjusted_Rect(itemRect_ListWidget(d, d->hoverItem),
+                                            zero_I2(), init_I2(-d->dragHandleWidth, 0)),
+                              pos_Click(&d->click)) &&
                 d->hoverItem != iInvalidPos) {
                 postCommand_Widget(w, "list.clicked arg:%zu item:%p",
                                    d->hoverItem, constHoverItem_ListWidget(d));
@@ -598,8 +620,9 @@ static void draw_ListWidget_(const iListWidget *d) {
     }
     setClip_Paint(&p, bounds_Widget(w));
     draw_VisBuf(d->visBuf, addY_I2(topLeft_Rect(bounds), -scrollY), ySpan_Rect(bounds));
-    const iInt2 mousePos = mouseCoord_Window(get_Window(), 0);
-    if (d->dragItem != iInvalidPos && contains_Rect(bounds, mousePos)) {
+    const iBool isMobile = (deviceType_App() != desktop_AppDeviceType);
+    const iInt2 mousePos = mouseCoord_Window(get_Window(), isMobile ? SDL_TOUCH_MOUSEID : 0);
+    if (d->dragItem != iInvalidPos && (isMobile || contains_Rect(bounds, mousePos))) {
         iInt2 pos = add_I2(mousePos, d->dragOrigin);
         const iListItem *item = constAt_PtrArray(&d->items, d->dragItem);
         const iRect itemRect = { init_I2(left_Rect(bounds), pos.y),
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index 081109e8..c5d412dd 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -66,6 +66,7 @@ struct Impl_ListWidget {
     size_t         hoverItem;
     size_t         dragItem;
     iInt2          dragOrigin; /* offset from mouse to drag item's top-left corner */
+    int            dragHandleWidth;
     iClick         click;
     iIntSet        invalidItems;
     iVisBuf       *visBuf;
@@ -90,6 +91,7 @@ int     scrollPos_ListWidget        (const iListWidget *);
 
 void    setScrollPos_ListWidget     (iListWidget *, int pos);
 void    setScrollMode_ListWidget    (iListWidget *, enum iScrollMode mode);
+void    setDragHandleWidth_ListWidget(iListWidget *, int dragHandleWidth);
 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);
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index ab282a86..633b33b8 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -243,6 +243,9 @@ static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
             else if (findWidget_App("upload")) {
                 postCommand_App("upload.cancel");
             }
+            else if (findWidget_App("bmed.sidebar")) {
+                postCommand_App("bmed.cancel");
+            }
             else if (findWidget_App("ident")) {
                 postCommand_Widget(topPanel, "ident.cancel");
             }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 48802ddf..b7e3b19a 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -117,7 +117,7 @@ struct Impl_SidebarWidget {
     iCertListWidget * certList;
     iWidget *         actions; /* below the list, area for buttons */
     int               midHeight; /* on portrait phone, the height for the middle state */
-    iBool             isBeingDraggedVertically; /* on portrait phone, sidebar can be dragged up/down */
+    iBool             isEditing; /* mobile edit mode */
     int               modeScroll[max_SidebarMode];
     iLabelWidget *    modeButtons[max_SidebarMode];
     int               maxButtonLabelWidth;
@@ -235,7 +235,18 @@ static iBool isBookmarkFolded_SidebarWidget_(const iSidebarWidget *d, const iBoo
 }
 
 static iBool isSlidingSheet_SidebarWidget_(const iSidebarWidget *d) {
-    return isPortraitPhone_App();// && scrollPos_ListWidget(d->list) <= 0;
+    return isPortraitPhone_App();
+}
+
+static void setMobileEditMode_SidebarWidget_(iSidebarWidget *d, iBool editing) {
+    iWidget *w = as_Widget(d);
+    d->isEditing = editing;
+    setFlags_Widget(findChild_Widget(w, "sidebar.close"), hidden_WidgetFlag, editing);
+    setFlags_Widget(child_Widget(d->actions, 0), hidden_WidgetFlag, !editing);
+    setTextCStr_LabelWidget(child_Widget(as_Widget(d->actions), 2),
+                            editing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}");
+    setDragHandleWidth_ListWidget(d->list, editing ? itemHeight_ListWidget(d->list) * 3 / 2 : 0);
+    arrange_Widget(d->actions);
 }
 
 static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepActions) {
@@ -482,6 +493,14 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                                { "---", 0, 0, NULL },
                                { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" } },               
                 6);
+            if (isMobile) {
+                addActionButton_SidebarWidget_(d, "${sidebar.action.bookmarks.newfolder}",
+                                               "bookmarks.addfolder", !d->isEditing ? hidden_WidgetFlag : 0);
+                addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag);
+                iLabelWidget *btn = addActionButton_SidebarWidget_(d,
+                    d->isEditing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}",
+                    "sidebar.bookmarks.edit", 0);
+            }
             break;
         }
         case history_SidebarMode: {
@@ -545,7 +564,6 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag);
                 iLabelWidget *btn = addActionButton_SidebarWidget_(d, "${sidebar.action.history.clear}",
                                                                    "history.clear confirm:1", 0);
-                setFont_LabelWidget(btn, uiLabelBigBold_FontId);
             }
             break;
         }
@@ -740,7 +758,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->mode = -1;
     d->feedsMode = all_FeedsMode;
     d->midHeight = 0;
-    d->isBeingDraggedVertically = iFalse;
+    d->isEditing = iFalse;
     d->numUnreadEntries = 0;
     d->buttonFont = uiLabel_FontId; /* wiil be changed later */
     d->itemFonts[0] = uiContent_FontId;
@@ -918,6 +936,12 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
             break;
         }
         case bookmarks_SidebarMode:
+            if (d->isEditing) {
+                d->contextItem = item;
+                d->contextIndex = itemIndex;
+                postCommand_Widget(d, "bookmark.edit");
+                break;
+            }
             if (isEmpty_String(&item->url)) /* a folder */ {
                 if (contains_IntSet(d->closedFolders, item->id)) {
                     remove_IntSet(d->closedFolders, item->id);
@@ -1174,6 +1198,9 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
             }
             else {
                 setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
+                if (d->isEditing) {
+                    setMobileEditMode_SidebarWidget_(d, iFalse);
+                }
             }
             showToolbar_Root(w->root, isHiding);
         }
@@ -1189,6 +1216,10 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         refresh_Widget(w->parent);
         return iTrue;
     }
+    else if (equal_Command(cmd, "bookmarks.edit")) {
+        setMobileEditMode_SidebarWidget_(d, !d->isEditing);
+        invalidate_ListWidget(d->list);
+    }
     return iFalse;
 }
 
@@ -1853,6 +1884,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                                            &Class_SidebarWidget);
     const iBool isMenuVisible = isVisible_Widget(sidebar->menu);
     const iBool isDragging   = constDragItem_ListWidget(list) == d;
+    const iBool isEditing    = sidebar->isEditing; /* only on mobile */
     const iBool isPressing   = isMouseDown_ListWidget(list) && !isDragging;
     const iBool isHover      =
             (!isMenuVisible &&
@@ -2006,6 +2038,16 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         drawRange_Text(font, textPos, fg, range_String(&d->label));
         const int metaFont = uiLabel_FontId;
         const int metaIconWidth = 4.5f * gap_UI;
+        if (isEditing) {
+            iRect dragRect = {
+                addX_I2(topRight_Rect(itemRect), -itemHeight * 3 / 2),
+                init_I2(itemHeight * 3 / 2, itemHeight)
+            };
+            fillRect_Paint(p, dragRect, bg);
+            drawVLine_Paint(p, topLeft_Rect(dragRect), height_Rect(dragRect), uiSeparator_ColorId);
+            drawCentered_Text(uiContent_FontId, dragRect, iTrue, uiAnnotation_ColorId, menu_Icon);
+            adjustEdges_Rect(&itemRect, 0, -width_Rect(dragRect), 0, 0);
+        }
         const iInt2 metaPos =
             init_I2(right_Rect(itemRect) -
                         length_String(&d->meta) *