liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1092] Make View reusable outside of dispatcher (#396)

Browse Source 
* View: replace direct View to ViewDispatcher link with callback. ViewDispatcher: update View usage. ViewHandler: update View usage, handle update signal.
This commit is contained in:
あく
2021-04-01 15:03:02 +03:00
committed by GitHub
parent 41c3b95f6d
commit 37131dbe12
7 changed files with 80 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
applications/gui/view.c
View File

@@ -11,13 +11,6 @@ void view_free(View* view) {
free(view);
}
void view_set_dispatcher(View* view, ViewDispatcher* view_dispatcher) {
furi_assert(view);
furi_assert(view_dispatcher);
furi_assert(view->dispatcher == NULL);
view->dispatcher = view_dispatcher;
}
void view_set_draw_callback(View* view, ViewDrawCallback callback) {
furi_assert(view);
furi_assert(view->draw_callback == NULL);
@@ -50,6 +43,16 @@ void view_set_exit_callback(View* view, ViewCallback callback) {
view->exit_callback = callback;
}
void view_set_update_callback(View* view, ViewUpdateCallback callback) {
furi_assert(view);
view->update_callback = callback;
}
void view_set_update_callback_context(View* view, void* context) {
furi_assert(view);
view->update_callback_context = context;
}
void view_set_context(View* view, void* context) {
furi_assert(view);
furi_assert(context);
@@ -105,8 +108,8 @@ void* view_get_model(View* view) {
void view_commit_model(View* view, bool update) {
furi_assert(view);
view_unlock_model(view);
if(update && view->dispatcher) {
view_dispatcher_update(view->dispatcher, view);
if(update && view->update_callback) {
view->update_callback(view, view->update_callback_context);
}
}