4 files changed, 66 insertions, 29 deletions

diff --git a/src/ui/touch.c b/src/ui/touch.c
index 14e5fe48..a55d370d 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -54,6 +54,7 @@ enum iTouchAxis {
 struct Impl_Touch {
     SDL_FingerID id;
     iWidget *affinity; /* widget on which the touch started */
+    iWidget *edgeDragging;
     iBool hasMoved;
     iBool isTapAndHold;
     enum iTouchEdge edge;
@@ -277,6 +278,15 @@ static iWidget *findOverflowScrollable_Widget_(iWidget *d) {
     return NULL;
 }
 
+static iWidget *findSlidePanel_Widget_(iWidget *d) {
+    for (iWidget *w = d; w; w = parent_Widget(w)) {
+        if (isVisible_Widget(w) && flags_Widget(w) & horizontalOffset_WidgetFlag) {
+            return w;
+        }
+    }
+    return NULL;
+}
+
 iBool processEvent_Touch(const SDL_Event *ev) {
     /* We only handle finger events here. */
     if (ev->type != SDL_FINGERDOWN && ev->type != SDL_FINGERMOTION && ev->type != SDL_FINGERUP) {
@@ -297,6 +307,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
         const float x = x_F3(pos);
         enum iTouchEdge edge = none_TouchEdge;
         const int edgeWidth = 30 * window->pixelRatio;
+        iWidget *dragging = NULL;
         if (x < edgeWidth) {
             edge = left_TouchEdge;
         }
@@ -304,9 +315,18 @@ iBool processEvent_Touch(const SDL_Event *ev) {
             edge = right_TouchEdge;
         }
         iWidget *aff = hitChild_Widget(window->root, init_I2(iRound(x), iRound(y_F3(pos))));
+        if (edge == left_TouchEdge) {
+            dragging = findSlidePanel_Widget_(aff);
+            if (dragging) {
+                setFlags_Widget(dragging, dragged_WidgetFlag, iTrue);
+            }
+        }
         /* TODO: We must retain a reference to the affinity widget, or otherwise it might
            be destroyed during the gesture. */
-        printf("aff:%p (%s)\n", aff, aff ? class_Widget(aff)->name : "-");
+        printf("aff:[%p] %s:'%s'\n", aff, aff ? class_Widget(aff)->name : "-",
+               cstr_String(id_Widget(aff)));
+        printf("drg:[%p] %s:'%s'\n", dragging, dragging ? class_Widget(dragging)->name : "-",
+               cstr_String(id_Widget(dragging)));
         if (flags_Widget(aff) & touchDrag_WidgetFlag) {
             dispatchEvent_Widget(window->root, (SDL_Event *) &(SDL_MouseButtonEvent){
                 .type = SDL_MOUSEBUTTONDOWN,
@@ -323,6 +343,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
         iTouch newTouch = {
             .id = fing->fingerId,
             .affinity = aff,
+            .edgeDragging = dragging,
             .hasMoved = (flags_Widget(aff) & touchDrag_WidgetFlag) != 0,
             .edge = edge,
             .startTime = nowTime,
@@ -390,8 +411,18 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 }
             }
             /* Edge swipe aborted? */
-            if (touch->edge == left_TouchEdge && fing->dx < 0) {
-                touch->edge = none_TouchEdge;
+            if (touch->edge == left_TouchEdge) {
+                if (fing->dx < 0) {
+                    touch->edge = none_TouchEdge;
+                    if (touch->edgeDragging) {
+                        setFlags_Widget(touch->edgeDragging, dragged_WidgetFlag, iFalse);
+                        setVisualOffset_Widget(touch->edgeDragging, 0, 200, easeOut_AnimFlag);
+                        touch->edgeDragging = NULL;
+                    }
+                }
+                else if (touch->edgeDragging) {
+                    setVisualOffset_Widget(touch->edgeDragging, x_F3(pos) - x_F3(touch->startPos), 10, 0);
+                }
             }
             if (touch->edge == right_TouchEdge && fing->dx > 0) {
                 touch->edge = none_TouchEdge;
@@ -430,6 +461,9 @@ iBool processEvent_Touch(const SDL_Event *ev) {
             if (touch->id != fing->fingerId) {
                 continue;
             }
+            if (touch->edgeDragging) {
+                setFlags_Widget(touch->edgeDragging, dragged_WidgetFlag, iFalse);
+            }
             if (touch->isTapAndHold) {
                 if (!isStationary_Touch_(touch)) {
                     dispatchClick_Touch_(touch, SDL_BUTTON_LEFT);
diff --git a/src/ui/util.c b/src/ui/util.c
index 0d34658e..826a965c 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -607,11 +607,12 @@ void closeMenu_Widget(iWidget *d) {
     postRefresh_App();
     postCommand_Widget(d, "menu.closed");
     if (isPortrait_App() && deviceType_App() == phone_AppDeviceType) {
+        const iBool wasDragged = iAbs(value_Anim(&d->visualOffset) - 0) > 1;
         setVisualOffset_Widget(d,
                                flags_Widget(d) & horizontalOffset_WidgetFlag ?
                                  width_Widget(d) : height_Widget(d),
-                               200,
-                               easeIn_AnimFlag | softer_AnimFlag);
+                               wasDragged ? 100 : 200,
+                               wasDragged ? 0 : easeIn_AnimFlag | softer_AnimFlag);
     }
 }
 
@@ -904,7 +905,7 @@ static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
         iWidget *button = pointer_Command(cmd);
         iWidget *panel = userData_Object(button);
         openMenu_Widget(panel, zero_I2());
-        updateTextCStr_LabelWidget(findWidget_App("panel.back"), "Settings");
+//        updateTextCStr_LabelWidget(findWidget_App("panel.back"), "");
         return iTrue;
     }
     if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd) &&
@@ -912,25 +913,6 @@ static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
         postCommand_App("panel.close");
         return iTrue;
     }
-    if (equal_Command(cmd, "window.resized")) {
-        iWidget *sheet = parent_Widget(d);
-#if defined (iPlatformAppleMobile)
-        float left, top, right, bottom;
-        safeAreaInsets_iOS(&left, &top, &right, &bottom);
-        /* TODO: incorrect */
-        if (isLandscape_App()) {
-            setPadding_Widget(sheet, left, 0, right, 0);
-        }
-        else {
-            setPadding1_Widget(sheet, 0);
-        }
-#endif
-    }
-    if (equal_Command(cmd, "panel.showhelp")) {
-        postCommand_App("prefs.dismiss");
-        postCommand_App("open url:about:help");
-        return iTrue;
-    }
     if (equal_Command(cmd, "panel.close")) {
         iBool wasClosed = iFalse;
         iForEach(ObjectList, i, children_Widget(parent_Widget(d))) {
@@ -947,7 +929,25 @@ static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
         }
         return iTrue;
     }
-    return iFalse;
+    if (equal_Command(cmd, "panel.showhelp")) {
+        postCommand_App("prefs.dismiss");
+        postCommand_App("open url:about:help");
+        return iTrue;
+    }
+    if (equal_Command(cmd, "window.resized")) {
+        iWidget *sheet = parent_Widget(d);
+#if defined (iPlatformAppleMobile)
+        float left, top, right, bottom;
+        safeAreaInsets_iOS(&left, &top, &right, &bottom);
+        /* TODO: incorrect */
+        if (isLandscape_App()) {
+            setPadding_Widget(sheet, left, 0, right, 0);
+        }
+        else {
+            setPadding1_Widget(sheet, 0);
+        }
+#endif
+    }    return iFalse;
 }
 
 static iBool isTwoColumnPage_(iWidget *d) {
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 4dd545b5..c7a23c54 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -152,7 +152,7 @@ void setId_Widget(iWidget *d, const char *id) {
 }
 
 const iString *id_Widget(const iWidget *d) {
-    return &d->id;
+    return d ? &d->id : collectNew_String();
 }
 
 int64_t flags_Widget(const iWidget *d) {
@@ -511,7 +511,7 @@ void arrange_Widget(iWidget *d) {
 }
 
 static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
-    if (d->flags & visualOffset_WidgetFlag) {
+    if (d->flags & (visualOffset_WidgetFlag | dragged_WidgetFlag)) {
         const int off = iRound(value_Anim(&d->visualOffset));
         if (d->flags & horizontalOffset_WidgetFlag) {
             pos->x += off;
@@ -544,7 +544,9 @@ iInt2 localCoord_Widget(const iWidget *d, iInt2 coord) {
 }
 
 iBool contains_Widget(const iWidget *d, iInt2 coord) {
-    const iRect bounds = { zero_I2(), d->rect.size };
+    const iRect bounds = { zero_I2(), addY_I2(d->rect.size,
+                                              d->flags & drawBackgroundToBottom_WidgetFlag ?
+                                                rootSize_Window(get_Window()).y : 0) };
     return contains_Rect(bounds, localCoord_Widget(d, coord));
 }
 
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 3edcb3f4..94a2d4a1 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -106,6 +106,7 @@ enum iWidgetFlag {
 #define horizontalOffset_WidgetFlag         iBit64(51) /* default is vertical offset */
 #define chevron_WidgetFlag                  iBit64(52)
 #define drawBackgroundToBottom_WidgetFlag   iBit64(53)
+#define dragged_WidgetFlag                  iBit64(54)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,