Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 17:38:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ofw-dev' into dev

Browse Source
This commit is contained in:
MX
2023-07-13 22:40:35 +03:00
parent ea357b8eaf 6605740ce9
commit 65bbaca380
11 changed files with 177 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
applications/services/desktop/scenes/desktop_scene_debug.c
View File

@@ -14,8 +14,6 @@ void desktop_scene_debug_callback(DesktopEvent event, void* context) {
void desktop_scene_debug_on_enter(void* context) {
Desktop* desktop = (Desktop*)context;
desktop_debug_get_dolphin_data(desktop->debug_view);
desktop_debug_set_callback(desktop->debug_view, desktop_scene_debug_callback, desktop);
view_dispatcher_switch_to_view(desktop->view_dispatcher, DesktopViewIdDebug);
}
@@ -32,24 +30,6 @@ bool desktop_scene_debug_on_event(void* context, SceneManagerEvent event) {
dolphin_flush(dolphin);
consumed = true;
break;
case DesktopDebugEventDeed:
dolphin_deed(DolphinDeedTestRight);
desktop_debug_get_dolphin_data(desktop->debug_view);
consumed = true;
break;
case DesktopDebugEventWrongDeed:
dolphin_deed(DolphinDeedTestLeft);
desktop_debug_get_dolphin_data(desktop->debug_view);
consumed = true;
break;
case DesktopDebugEventSaveState:
dolphin_flush(dolphin);
consumed = true;
break;
default:
break;
}
@@ -60,6 +40,5 @@ bool desktop_scene_debug_on_event(void* context, SceneManagerEvent event) {
}
void desktop_scene_debug_on_exit(void* context) {
Desktop* desktop = (Desktop*)context;
desktop_debug_reset_screen_idx(desktop->debug_view);
UNUSED(context);
}

2
applications/services/desktop/scenes/desktop_scene_main.c
View File

@@ -72,7 +72,7 @@ static void desktop_scene_main_open_app_or_profile(Desktop* desktop, const char*
static void desktop_scene_main_start_favorite(Desktop* desktop, FavoriteApp* application) {
if(strlen(application->name_or_path) > 2) {
loader_start_with_gui_error(desktop->loader, application->name_or_path, NULL);
} else if((strlen(application->name_or_path) < 2) && (application->is_external == true)) {
} else if(strlen(application->name_or_path) < 2) {
loader_start(desktop->loader, LOADER_APPLICATIONS_NAME, NULL, NULL);
}
}