From 5cab0f89346b4a4b7c3f0333cd37a892ced59ef6 Mon Sep 17 00:00:00 2001 From: Francis Nguyen Date: Fri, 12 Feb 2021 17:41:14 -0700 Subject: [PATCH 1/2] Set alignment to MenuRowAlignCenter on submenu return --- Apps/System/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apps/System/menu.c b/Apps/System/menu.c index 9cc3a406..1e645d83 100644 --- a/Apps/System/menu.c +++ b/Apps/System/menu.c @@ -171,7 +171,7 @@ static void back_single_click_handler(ClickRecognizerRef _, Menu *menu) MenuItems *prev = menu->items; menu->items = prev->back; menu_layer_reload_data(menu->layer); - menu_layer_set_selected_index(menu->layer, prev->back_index, MenuRowAlignTop, false); + menu_layer_set_selected_index(menu->layer, prev->back_index, MenuRowAlignCenter, false); prev->back = NULL; // so we don't free that menu_items_destroy(prev); } From bc19aafc100447d4fa6912a238a53c8011b817d4 Mon Sep 17 00:00:00 2001 From: Francis Nguyen Date: Thu, 18 Feb 2021 21:59:35 -0700 Subject: [PATCH 2/2] Handle setting non-animated content offsets --- rwatch/ui/layer/scroll_layer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rwatch/ui/layer/scroll_layer.c b/rwatch/ui/layer/scroll_layer.c index acef965e..019664be 100644 --- a/rwatch/ui/layer/scroll_layer.c +++ b/rwatch/ui/layer/scroll_layer.c @@ -147,6 +147,10 @@ void scroll_layer_set_content_offset(ScrollLayer *scroll_layer, GPoint offset, b animation_set_duration(anim, 100); animation_schedule(anim); } + else + { + layer_set_frame(&scroll_layer->content_sublayer, scroll_layer->scroll_offset); + } } GPoint scroll_layer_get_content_offset(ScrollLayer *scroll_layer)