Skip to content

Set alignment to MenuRowAlignCenter on submenu return #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwise merged 2 commits into from
Feb 27, 2021
Merged

Set alignment to MenuRowAlignCenter on submenu return #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cab0f8
Set alignment to MenuRowAlignCenter on submenu return
frbncis Feb 13, 2021
bc19aaf
Handle setting non-animated content offsets
frbncis Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Apps/System/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 4 additions & 0 deletions rwatch/ui/layer/scroll_layer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down