Merge branch 'fz-dev' into dev

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

View file

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

View file

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

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) {
Desktop* desktop = (Desktop*)context;
if(desktop->in_transition) return;
view_dispatcher_send_custom_event(desktop->view_dispatcher, event);
}