alex/cacao
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Experimenting with Drop logic - will extend to View/etc if it works fine with Window. I... think it will.

Browse source
This commit is contained in:
Ryan McGrath 2020-03-23 21:16:13 -07:00
parent 8910a88a93
commit d7c367e7e9
No known key found for this signature in database
GPG key ID: 811674B62B666830
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
appkit/window/mod.rs
View file

@ -242,20 +242,28 @@ impl<T> Window<T> where T: WindowDelegate + 'static {
} }
} }
/*impl<T> Drop for Window<T> { impl<T> Drop for Window<T> {
/// When a Window is dropped on the Rust side, we want to ensure that we break the delegate /// When a Window is dropped on the Rust side, we want to ensure that we break the delegate
/// link on the Objective-C side. While this shouldn't actually be an issue, I'd rather be /// link on the Objective-C side. While this shouldn't actually be an issue, I'd rather be
/// safer than sorry. /// safer than sorry.
/// ///
/// We also clean up our loopback pointer that we use for callbacks. /// We also clean up our loopback pointer that we use for callbacks.
///
/// Note that only the originating `Window<T>` carries the internal callback ptr, and we
/// intentionally don't provide this when cloning it as a handler. This ensures that we only
/// release the backing Window when the original `Window<T>` is dropped.
///
/// Well, theoretically.
fn drop(&mut self) { fn drop(&mut self) {
unsafe { if let Some(ptr) = self.internal_callback_ptr {
if let Some(objc_controller) = &self.objc_controller.0 { unsafe {
let window: id = msg_send![*objc_controller, window]; // Break the delegate - this shouldn't be an issue, but we should strive to be safe
let _: () = msg_send![window, setDelegate:nil]; // here anyway.
} let _: () = msg_send![&*self.objc, setDelegate:nil];
let _ = Rc::from_raw(self.internal_callback_ptr); // Bring this back and let it drop naturally.
let _ = Rc::from_raw(ptr);
}
} }
} }
}*/ }