alex/baseview
1
0
Fork 0
Code Activity

Replace AtomicBool with Cell<bool>

Browse source 
https://github.com/RustAudio/baseview/pull/136#discussion_r1059198419
This commit is contained in:
Robbert van der Helm 2023-01-01 22:35:23 +01:00
parent 512c3f2393
commit 96c0401865
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/win/window.rs
View file

@ -23,7 +23,6 @@ use std::marker::PhantomData;
use std::os::windows::ffi::OsStrExt; use std::os::windows::ffi::OsStrExt;
use std::ptr::null_mut; use std::ptr::null_mut;
use std::rc::Rc; use std::rc::Rc;
use std::sync::atomic::{AtomicBool, Ordering};
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, Win32Handle}; use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, Win32Handle};
@ -62,7 +61,7 @@ const WIN_FRAME_TIMER: usize = 4242;
pub struct WindowHandle { pub struct WindowHandle {
hwnd: Option<HWND>, hwnd: Option<HWND>,
is_open: Rc<AtomicBool>, is_open: Rc<Cell<bool>>,
// Ensure handle is !Send // Ensure handle is !Send
_phantom: PhantomData<*mut ()>, _phantom: PhantomData<*mut ()>,
@ -78,7 +77,7 @@ impl WindowHandle {
} }
pub fn is_open(&self) -> bool { pub fn is_open(&self) -> bool {
self.is_open.load(Ordering::Relaxed) self.is_open.get()
} }
} }
@ -96,12 +95,12 @@ unsafe impl HasRawWindowHandle for WindowHandle {
} }
struct ParentHandle { struct ParentHandle {
is_open: Rc<AtomicBool>, is_open: Rc<Cell<bool>>,
} }
impl ParentHandle { impl ParentHandle {
pub fn new(hwnd: HWND) -> (Self, WindowHandle) { pub fn new(hwnd: HWND) -> (Self, WindowHandle) {
let is_open = Rc::new(AtomicBool::new(true)); let is_open = Rc::new(Cell::new(true));
let handle = WindowHandle { let handle = WindowHandle {
hwnd: Some(hwnd), hwnd: Some(hwnd),
@ -115,7 +114,7 @@ impl ParentHandle {
impl Drop for ParentHandle { impl Drop for ParentHandle {
fn drop(&mut self) { fn drop(&mut self) {
self.is_open.store(false, Ordering::Relaxed); self.is_open.set(false);
} }
} }