summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/app.c4
-rw-r--r--src/ui/sidebarwidget.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/app.c b/src/app.c
index 27ce93ce..9697ee2b 100644
--- a/src/app.c
+++ b/src/app.c
@@ -420,8 +420,8 @@ static iBool loadState_App_(iApp *d) {
420 if (deviceType_App() != phone_AppDeviceType) { 420 if (deviceType_App() != phone_AppDeviceType) {
421 setWidth_SidebarWidget(sidebar, widths[0]); 421 setWidth_SidebarWidget(sidebar, widths[0]);
422 setWidth_SidebarWidget(sidebar2, widths[1]); 422 setWidth_SidebarWidget(sidebar2, widths[1]);
423 if (flags & 1) postCommand_Root(root, "sidebar.toggle"); 423 if (flags & 1) postCommand_Root(root, "sidebar.toggle noanim:1");
424 if (flags & 2) postCommand_Root(root, "sidebar2.toggle"); 424 if (flags & 2) postCommand_Root(root, "sidebar2.toggle noanim:1");
425 } 425 }
426 } 426 }
427 } 427 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 436eb250..cb6dab65 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -878,7 +878,8 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
878 if (arg_Command(cmd) && isVisible_Widget(w)) { 878 if (arg_Command(cmd) && isVisible_Widget(w)) {
879 return iTrue; 879 return iTrue;
880 } 880 }
881 const iBool isAnimated = (deviceType_App() != phone_AppDeviceType); 881 const iBool isAnimated = argLabel_Command(cmd, "noanim") == 0 &&
882 (deviceType_App() != phone_AppDeviceType);
882 int visX = 0; 883 int visX = 0;
883 if (isVisible_Widget(w)) { 884 if (isVisible_Widget(w)) {
884 visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect); 885 visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
@@ -895,6 +896,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
895 } 896 }
896 } 897 }
897 else if (isAnimated) { 898 else if (isAnimated) {
899 setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
898 if (d->side == right_SideBarSide) { 900 if (d->side == right_SideBarSide) {
899 setVisualOffset_Widget(w, visX, 0, 0); 901 setVisualOffset_Widget(w, visX, 0, 0);
900 setVisualOffset_Widget(w, visX + w->rect.size.x, 300, easeOut_AnimFlag | softer_AnimFlag); 902 setVisualOffset_Widget(w, visX + w->rect.size.x, 300, easeOut_AnimFlag | softer_AnimFlag);