Skip to content

FerroUI main: subscription guards #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wieslawsoltes merged 2 commits into from
Nov 2, 2026
Merged

FerroUI main: subscription guards #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7e4d49
FerroUI b75373981: subscription guards
wieslawsoltes Nov 2, 2026
71e4b34
Subscription guards: keep the window closing handler, hold the timers
wieslawsoltes Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FerroUI
Open in desktop
Submodule FerroUI updated 616 files
2 changes: 1 addition & 1 deletion crates/ferrodesign-app/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl ApplicationImpl for App {
if let Some(shell) = weak.upgrade() {
if !shell.command("commit-edit") { event.set_cancel(true); }
}
});
}).detach();
desktop.set_main_window(Some(window));
}
SHELL.with(|slot| *slot.borrow_mut() = Some(shell));
Expand Down
4 changes: 2 additions & 2 deletions crates/ferrodesign-app/src/prototype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use ferrodesign_core::{
PrototypeScene, PrototypeTimer, Transition, TransitionKind, Trigger, Viewport, MAX_DOCUMENT_DEPTH,
};
use ferroui_base::animation::{Clock, IClock, PlayState, TimeSpan};
use ferroui_base::reactive::{AnonymousObserver, IDisposable, IObservable};
use ferroui_base::reactive::{AnonymousObserver, IDisposable, IObservable, Subscription};
use ferroui_base::threading::{DispatcherPriority, DispatcherTimer};
use ferroui_base::Ref;
use std::{
Expand Down Expand Up @@ -53,7 +53,7 @@ struct AuthoredSnapshot {
}

struct ScheduledTimer {
subscription: Rc<dyn IDisposable>,
subscription: Subscription,
}

pub struct PrototypeRuntime {
Expand Down
4 changes: 2 additions & 2 deletions crates/ferrodesign-app/src/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use ferroui_base::layout::{Orientation, VerticalAlignment};
use ferroui_base::media::{FontWeight, TextWrapping};
use ferroui_base::metadata::from_markup_value;
use ferroui_base::utilities::{Uri, UriKind};
use ferroui_base::reactive::IDisposable;
use ferroui_base::reactive::{IDisposable, Subscription};
use ferroui_base::threading::{DispatcherPriority, DispatcherTimer};
use std::time::{Duration, Instant};
use ferroui_base::{BoxedValue, ObjectType, Ref, Thickness, WeakRef};
Expand Down Expand Up @@ -72,7 +72,7 @@ pub struct EditorShell {
prototype_targets: RefCell<Vec<NodeId>>,
prototype: Rc<PrototypeRuntime>,
pending_save: Cell<bool>,
pending_save_timer: RefCell<Option<Rc<dyn IDisposable>>>,
pending_save_timer: RefCell<Option<Subscription>>,
save_serializations: Cell<u64>,
last_serialization_ms: Cell<f64>,
scene_frames: Cell<u64>,
Expand Down
Loading