Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-27 06:50:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fz-dev' into dev

Browse source
This commit is contained in:
MX 2023-03-09 16:58:51 +03:00
commit dfc45eb0f9
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/services/desktop/desktop.c
View file

@ -147,11 +147,13 @@ void desktop_unlock(Desktop* desktop) {
} }
void desktop_set_dummy_mode_state(Desktop* desktop, bool enabled) { void desktop_set_dummy_mode_state(Desktop* desktop, bool enabled) {
desktop->in_transition = true;
view_port_enabled_set(desktop->dummy_mode_icon_viewport, enabled); view_port_enabled_set(desktop->dummy_mode_icon_viewport, enabled);
desktop_main_set_dummy_mode_state(desktop->main_view, enabled); desktop_main_set_dummy_mode_state(desktop->main_view, enabled);
animation_manager_set_dummy_mode_state(desktop->animation_manager, enabled); animation_manager_set_dummy_mode_state(desktop->animation_manager, enabled);
desktop->settings.dummy_mode = enabled; desktop->settings.dummy_mode = enabled;
DESKTOP_SETTINGS_SAVE(&desktop->settings); DESKTOP_SETTINGS_SAVE(&desktop->settings);
desktop->in_transition = false;
} }
Desktop* desktop_alloc() { Desktop* desktop_alloc() {

2
applications/services/desktop/desktop_i.h
View file

@ -69,6 +69,8 @@ struct Desktop {
FuriPubSub* input_events_pubsub; FuriPubSub* input_events_pubsub;
FuriPubSubSubscription* input_events_subscription; FuriPubSubSubscription* input_events_subscription;
FuriTimer* auto_lock_timer; FuriTimer* auto_lock_timer;
bool in_transition;
}; };
Desktop* desktop_alloc(); Desktop* desktop_alloc();

1
applications/services/desktop/scenes/desktop_scene_main.c
View file

@ -63,6 +63,7 @@ static void desktop_switch_to_app(Desktop* desktop, const FlipperApplication* fl
void desktop_scene_main_callback(DesktopEvent event, void* context) { void desktop_scene_main_callback(DesktopEvent event, void* context) {
Desktop* desktop = (Desktop*)context; Desktop* desktop = (Desktop*)context;
if(desktop->in_transition) return;
view_dispatcher_send_custom_event(desktop->view_dispatcher, event); view_dispatcher_send_custom_event(desktop->view_dispatcher, event);
} }