Edge-dragging preference panels

1 files changed, 23 insertions, 23 deletions

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) {