Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
MX
2023-08-11 18:24:51 +03:00
parent 4b81046b6f
commit 8d8102b4f9
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/services/gui/gui.h
View File

@@ -132,8 +132,6 @@ Canvas* gui_direct_draw_acquire(Gui* gui);
*/
void gui_direct_draw_release(Gui* gui);
uint8_t gui_get_count_of_enabled_view_port_in_layer(Gui* gui, GuiLayer layer);
#ifdef __cplusplus
}
#endif

5
applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
View File

@@ -167,14 +167,9 @@ bool desktop_settings_scene_start_on_event(void* context, SceneManagerEvent even
break;
case SCENE_EVENT_SELECT_AUTO_LOCK_DELAY:
case SCENE_EVENT_SELECT_CLOCK_DISPLAY:
consumed = true;
break;
case SCENE_EVENT_SELECT_BATTERY_DISPLAY:
consumed = true;
break;
case SCENE_EVENT_SELECT_CLOCK_DISPLAY:
consumed = true;
break;
case SCENE_EVENT_SELECT_CHANGE_NAME:
scene_manager_next_scene(app->scene_manager, DesktopSettingsAppSceneChangeName);
consumed = true;