Skip to content

FerroUI main: subscription guards #3

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 #3

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
e0e37db
FerroUI b75373981: subscription guards
wieslawsoltes Nov 2, 2026
a4c656c
Keep the subscriptions that live as long as their source
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 Solitaire/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub fn create_main_window() -> Ref<Window> {
move || window.close(),
std::time::Duration::from_millis(ms),
ferroui::base::threading::DispatcherPriority::NORMAL,
);
).detach();
}
window
}
Expand Down
10 changes: 5 additions & 5 deletions Solitaire/src/views/casino_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use ferroui::{
controls::ResourceDictionary,
input::{InputElement, Key, KeyModifiers},
media::{DrawingImage, IImage},
reactive::IDisposable,
reactive::Subscription,
threading::{DispatcherPriority, DispatcherTimer},
},
controls::{
Expand Down Expand Up @@ -47,9 +47,9 @@ pub struct CasinoView {
pub page: RefCell<Option<Ref<UserControl>>>,
artwork: Ref<ResourceDictionary>,
dialog: Cell<DialogAction>,
timer: RefCell<Option<Rc<dyn IDisposable>>>,
timer: RefCell<Option<Subscription>>,
presentation: RefCell<Option<VecDeque<PresentationFrame>>>,
presentation_timer: RefCell<Option<Rc<dyn IDisposable>>>,
presentation_timer: RefCell<Option<Subscription>>,
presentation_generation: Cell<u64>,
}
impl CasinoView {
Expand Down Expand Up @@ -109,7 +109,7 @@ impl CasinoView {
if let Some(timer) = this.timer.borrow_mut().take() {
timer.dispose();
}
});
}).detach();
let weak_window = window.downgrade();
self.start_clock(Rc::downgrade(self), move || {
weak_window.upgrade().map(|window| window.is_active())
Expand Down Expand Up @@ -380,7 +380,7 @@ impl CasinoView {
},
Duration::from_millis(16),
DispatcherPriority::NORMAL,
);
).detach();
*self.page.borrow_mut() = Some(view);
self.update_score();
self.refresh_message();
Expand Down
Loading