Dialog show/hide animations

Use the animations introduced for mobile on desktop as well. Adding a
preference for this might be prudent.

6 files changed, 51 insertions, 25 deletions

diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 6c3a0b32..d678f3e1 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -381,22 +381,22 @@ void finalizeSheet_Mobile(iWidget *sheet) {
         }
         /* TODO: In portrait, top panel and detail stack are all stacked together.
          
-                 Landscape Layout                 Portrait Layout
-                                              
-        ┌─────────┬──────Detail─Stack─────┐    ┌─────────┬ ─ ─ ─ ─ ┐
-        │         │┌───────────────────┐  │    │         │Detail
-        │         ││┌──────────────────┴┐ │    │         │Stack    │
-        │         │││┌──────────────────┴┐│    │         │┌──────┐
-        │         ││││                   ││    │         ││┌─────┴┐│
-        │         ││││                   ││    │         │││      │
-        │Top Panel││││                   ││    │Top Panel│││      ││
-        │         ││││      Panels       ││    │         │││Panels│
-        │         ││││                   ││    │         │││      ││
-        │         │└┤│                   ││    │         │││      │
-        │         │ └┤                   ││    │         │└┤      ││
-        │         │  └───────────────────┘│    │         │ └──────┘
-        └─────────┴───────────────────────┘    └─────────┴ ─ ─ ─ ─ ┘
-                                                          offscreen
+                 Landscape Layout                 Portrait Layout
+                                              
+        ┌─────────┬──────Detail─Stack─────┐    ┌─────────┬ ─ ─ ─ ─ ┐
+        │         │┌───────────────────┐  │    │         │Detail
+        │         ││┌──────────────────┴┐ │    │         │Stack    │
+        │         │││┌──────────────────┴┐│    │         │┌──────┐
+        │         ││││                   ││    │         ││┌─────┴┐│
+        │         ││││                   ││    │         │││      │
+        │Top Panel││││                   ││    │Top Panel│││      ││
+        │         ││││      Panels       ││    │         │││Panels│
+        │         ││││                   ││    │         │││      ││
+        │         │└┤│                   ││    │         │││      │
+        │         │ └┤                   ││    │         │└┤      ││
+        │         │  └───────────────────┘│    │         │ └──────┘
+        └─────────┴───────────────────────┘    └─────────┴ ─ ─ ─ ─ ┘
+                                                          offscreen
         */
         /* Modify the top sheet to act as a fullscreen background. */
         setPadding1_Widget(sheet, 0);
@@ -759,6 +759,9 @@ void finalizeSheet_Mobile(iWidget *sheet) {
     else {
         arrange_Widget(sheet);
     }
+    if (!useMobileSheetLayout_()) {
+        setupSheetTransition_Mobile(sheet, iTrue);
+    }
     postRefresh_App();
 }
 
@@ -784,16 +787,26 @@ void setupMenuTransition_Mobile(iWidget *sheet, iBool isIncoming) {
 }
 
 void setupSheetTransition_Mobile(iWidget *sheet, iBool isIncoming) {
-    if (isSideBySideLayout_()) {
+    if (!useMobileSheetLayout_()) {
+        setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iFalse);
+        if (isIncoming) {
+            setVisualOffset_Widget(sheet, -height_Widget(sheet), 0, 0);
+            setVisualOffset_Widget(sheet, 0, 200, easeOut_AnimFlag | softer_AnimFlag);
+        }
+        else {
+            setVisualOffset_Widget(sheet, -height_Widget(sheet), 200, easeIn_AnimFlag);
+        }
+        return;
+    }
+    if(isSideBySideLayout_()) {
         return;
     }
+    setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iTrue);
     if (isIncoming) {
-        setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iTrue);
         setVisualOffset_Widget(sheet, size_Root(sheet->root).x, 0, 0);
         setVisualOffset_Widget(sheet, 0, 200, easeOut_AnimFlag);
     }
     else {
-        setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iTrue);
         const iBool wasDragged = iAbs(value_Anim(&sheet->visualOffset)) > 0;
         setVisualOffset_Widget(sheet, size_Root(sheet->root).x, wasDragged ? 100 : 200,
                                wasDragged ? 0 : easeIn_AnimFlag);
diff --git a/src/ui/root.c b/src/ui/root.c
index 9ed62711..6c65d18f 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -276,6 +276,9 @@ void destroyPending_Root(iRoot *d) {
         if (!isFinished_Anim(&widget->visualOffset)) {
             continue;
         }
+        if (widget->flags & keepOnTop_WidgetFlag) {
+            removeOne_PtrArray(onTop_Root(widget->root), widget);
+        }
         if (widget->parent) {
             removeChild_Widget(widget->parent, widget);
         }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 86410d11..ac2d147e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1460,7 +1460,8 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
     const iRect    bounds = bounds_Widget(w);
     iPaint p;
     init_Paint(&p);
-    if (flags_Widget(w) & visualOffset_WidgetFlag && isVisible_Widget(w)) {
+    if (flags_Widget(w) & visualOffset_WidgetFlag &&
+        flags_Widget(w) & horizontalOffset_WidgetFlag && isVisible_Widget(w)) {
         fillRect_Paint(&p, boundsWithoutVisualOffset_Widget(w), tmBackground_ColorId);
     }
     draw_Widget(w);
diff --git a/src/ui/translation.c b/src/ui/translation.c
index 4102fcb9..ed7e5baa 100644
--- a/src/ui/translation.c
+++ b/src/ui/translation.c
@@ -460,6 +460,7 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
     if (equalWidget_Command(cmd, w, "translation.finished")) {
         if (!isFinished_Translation(d)) {
             if (processResult_Translation_(d)) {
+                setupSheetTransition_Mobile(d->dlg, iFalse);
                 destroy_Widget(d->dlg);
                 d->dlg = NULL;
             }
@@ -476,6 +477,7 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
             cancel_TlsRequest(d->request);
         }
         else {
+            setupSheetTransition_Mobile(d->dlg, iFalse);
             destroy_Widget(d->dlg);
             d->dlg = NULL;
         }
diff --git a/src/ui/util.c b/src/ui/util.c
index 4b35f8f7..86478300 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1176,6 +1176,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
                 postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
                 setId_Widget(dlg, ""); /* no further commands to emit */
             }
+            setupSheetTransition_Mobile(dlg, iFalse);
             destroy_Widget(dlg);
             return iTrue;
         }
@@ -1184,11 +1185,13 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     else if (equal_Command(cmd, "cancel")) {
         postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
         setId_Widget(dlg, ""); /* no further commands to emit */
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
     else if (equal_Command(cmd, "valueinput.accept")) {
         acceptValueInput_(dlg);
+        setupSheetTransition_Mobile(dlg, iFalse);        
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -1324,6 +1327,7 @@ static iBool messageHandler_(iWidget *msg, const char *cmd) {
           equal_Command(cmd, "scrollbar.fade") ||
           equal_Command(cmd, "widget.overflow") ||
           startsWith_CStr(cmd, "window."))) {
+        setupSheetTransition_Mobile(msg, iFalse);
         destroy_Widget(msg);
     }
     return iFalse;
@@ -1908,6 +1912,7 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             }
             postCommand_App("bookmarks.changed");
         }
+        setupSheetTransition_Mobile(editor, iFalse);
         destroy_Widget(editor);
         return iTrue;
     }
@@ -1937,6 +1942,7 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
 
 static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
     if (equal_Command(cmd, "cancel")) {
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -1971,6 +1977,7 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
             }
         }
         postCommand_App("bookmarks.changed");
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 64f586ce..5502cb8e 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -101,9 +101,6 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) {
         setFocus_Widget(NULL);
         return;
     }
-    if (flags_Widget(d) & keepOnTop_WidgetFlag) {
-        removeOne_PtrArray(onTop_Root(d->root), d);
-    }
     remove_Periodic(periodic_App(), d);
     if (isHover_Widget(d)) {
         get_Window()->hover = NULL;
@@ -858,6 +855,9 @@ iLocalDef iBool isMouseEvent_(const SDL_Event *ev) {
 }
 
 static iBool filterEvent_Widget_(const iWidget *d, const SDL_Event *ev) {
+    if (d->flags & destroyPending_WidgetFlag) {
+        return iFalse; /* no more events handled */
+    }
     const iBool isKey   = isKeyboardEvent_(ev);
     const iBool isMouse = isMouseEvent_(ev);
     if ((d->flags & disabled_WidgetFlag) || (d->flags & hidden_WidgetFlag &&
@@ -1103,8 +1103,8 @@ void drawBackground_Widget(const iWidget *d) {
         drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
     }
     const iBool isFaded = fadeBackground &&
-                          ~d->flags & noFadeBackground_WidgetFlag &&
-                          ~d->flags & destroyPending_WidgetFlag;
+                          ~d->flags & noFadeBackground_WidgetFlag;/* &&
+                          ~d->flags & destroyPending_WidgetFlag;*/
     if (isFaded) {
         iPaint p;
         init_Paint(&p);