SidebarWidget: Fixed animations in the 2nd split

2 files changed, 35 insertions, 26 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index 66f3b7dd..15336d77 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,10 @@
 ```
 # Release notes
 
+## 1.10.5
+* Fixed animation issue with sidebars in the right side of split view.
+* macOS: Fixed a sidebar clipping issue with Metal.
+
 ## 1.10.4
 * Added missing ANSI background color codes 100-107 (high-intensity VGA).
 * Fixed how the ANSI FG color is adjusted to keep text legible on dark or bright backgrounds when BG color is unset.
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 16677f9e..da0ec22c 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1181,39 +1181,43 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                                  argLabel_Command(cmd, "noanim") == 0 &&
                                  (d->side == left_SidebarSide || deviceType_App() != phone_AppDeviceType);
         int visX = 0;
-        int visY = 0;
+//        int visY = 0;
         if (isVisible_Widget(w)) {
             visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
-            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
+//            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
         }
         const iBool isHiding = isVisible_Widget(w);
         setFlags_Widget(w, hidden_WidgetFlag, isHiding);
         /* Safe area inset for mobile. */
-        const int safePad = (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
+        const int safePad =
+            deviceType_App() == desktop_AppDeviceType
+                ? 0
+                : (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
         const int animFlags = easeOut_AnimFlag | softer_AnimFlag;
         if (!isPortraitPhone_App()) {
             if (!isHiding) {
-            setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
-            w->rect.size.x = d->widthAsGaps * gap_UI;
-            invalidate_ListWidget(d->list);
-            if (isAnimated) {
-                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-                setVisualOffset_Widget(
-                    w, (d->side == left_SidebarSide ? -1 : 1) * (w->rect.size.x + safePad), 0, 0);
+                setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
+                w->rect.size.x = d->widthAsGaps * gap_UI;
+                invalidate_ListWidget(d->list);
+                if (isAnimated) {
+                    setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                    setVisualOffset_Widget(w,
+                                           (d->side == left_SidebarSide ? -1 : 1) *
+                                               (w->rect.size.x + safePad),
+                                           0,
+                                           0);
                     setVisualOffset_Widget(w, 0, 300, animFlags);
+                }
             }
-        }
-        else if (isAnimated) {
-            setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-            if (d->side == right_SidebarSide) {
-                setVisualOffset_Widget(w, visX, 0, 0);
-                setVisualOffset_Widget(
-                        w, visX + w->rect.size.x + safePad, 300, animFlags);
-            }
-            else {
-                setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
-                setVisualOffset_Widget(
-                        w, -w->rect.size.x - safePad, 300, animFlags);
+            else if (isAnimated) {
+                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                if (d->side == right_SidebarSide) {
+                    setVisualOffset_Widget(w, visX, 0, 0);
+                    setVisualOffset_Widget(w, visX + w->rect.size.x + safePad, 300, animFlags);
+                }
+                else {
+                    setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
+                    setVisualOffset_Widget(w, -w->rect.size.x - safePad, 300, animFlags);
                 }
             }
             setScrollMode_ListWidget(d->list, normal_ScrollMode);
@@ -1226,15 +1230,16 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                 w->rect.pos.y = height_Rect(safeRect_Root(w->root)) - d->midHeight;
                 setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 0, 0);
                 setVisualOffset_Widget(w, 0, 300, animFlags);
-                //animateSlidingSheetHeight_SidebarWidget_(d);
+                // animateSlidingSheetHeight_SidebarWidget_(d);
                 setScrollMode_ListWidget(d->list, disabledAtTopBothDirections_ScrollMode);
             }
             else {
-                setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
+                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);
         }
         updateToolbarColors_Root(w->root);
@@ -1242,7 +1247,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
         arrange_Widget(w);
         if (!isPortraitPhone_App()) {
-        updateSize_DocumentWidget(document_App());
+            updateSize_DocumentWidget(document_App());
         }
         if (isVisible_Widget(w)) {
             updateItems_SidebarWidget_(d);