wayland: change some borrow_mut to borrow, reduce borrow scopes, fix two crashes (#9306)

Release Notes:

- N/A
This commit is contained in:
Luke Jones 2024-03-20 08:40:09 +13:00 committed by GitHub
parent 086f4e63c5
commit cfa0fc96f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 24 deletions

View file

@ -43,7 +43,6 @@ struct WaylandWindowInner {
renderer: BladeRenderer,
bounds: Bounds<u32>,
scale: f32,
fullscreen: bool,
input_handler: Option<PlatformInputHandler>,
decoration_state: WaylandDecorationState,
}
@ -102,7 +101,6 @@ impl WaylandWindowInner {
renderer: BladeRenderer::new(gpu, extent),
bounds,
scale: 1.0,
fullscreen: false,
input_handler: None,
// On wayland, decorations are by default provided by the client
@ -118,6 +116,7 @@ pub(crate) struct WaylandWindowState {
pub(crate) toplevel: Arc<xdg_toplevel::XdgToplevel>,
pub(crate) outputs: RefCell<HashSet<ObjectId>>,
viewport: Option<wp_viewport::WpViewport>,
fullscreen: RefCell<bool>,
}
impl WaylandWindowState {
@ -136,6 +135,7 @@ impl WaylandWindowState {
outputs: RefCell::new(HashSet::default()),
toplevel,
viewport,
fullscreen: RefCell::new(false),
}
}
@ -197,7 +197,6 @@ impl WaylandWindowState {
}
pub fn resize(&self, width: Option<NonZeroU32>, height: Option<NonZeroU32>) {
let scale = self.inner.borrow_mut().scale;
self.set_size_and_scale(width, height, None);
}
@ -210,7 +209,7 @@ impl WaylandWindowState {
if let Some(ref mut fun) = callbacks.fullscreen {
fun(fullscreen)
}
self.inner.borrow_mut().fullscreen = fullscreen;
self.fullscreen.replace(fullscreen);
}
/// Notifies the window of the state of the decorations.
@ -285,7 +284,7 @@ impl PlatformWindow for WaylandWindow {
}
fn content_size(&self) -> Size<Pixels> {
let inner = self.0.inner.borrow_mut();
let inner = self.0.inner.borrow();
Size {
width: Pixels(inner.bounds.size.width as f32),
height: Pixels(inner.bounds.size.height as f32),
@ -293,7 +292,7 @@ impl PlatformWindow for WaylandWindow {
}
fn scale_factor(&self) -> f32 {
self.0.inner.borrow_mut().scale
self.0.inner.borrow().scale
}
// todo(linux)
@ -363,7 +362,7 @@ impl PlatformWindow for WaylandWindow {
}
fn toggle_fullscreen(&self) {
if !self.0.inner.borrow().fullscreen {
if !(*self.0.fullscreen.borrow()) {
self.0.toplevel.set_fullscreen(None);
} else {
self.0.toplevel.unset_fullscreen();
@ -371,7 +370,7 @@ impl PlatformWindow for WaylandWindow {
}
fn is_fullscreen(&self) -> bool {
self.0.inner.borrow_mut().fullscreen
*self.0.fullscreen.borrow()
}
fn on_request_frame(&self, callback: Box<dyn FnMut()>) {
@ -416,12 +415,11 @@ impl PlatformWindow for WaylandWindow {
}
fn draw(&self, scene: &Scene) {
let mut inner = self.0.inner.borrow_mut();
inner.renderer.draw(scene);
self.0.inner.borrow_mut().renderer.draw(scene);
}
fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas> {
let inner = self.0.inner.borrow_mut();
let inner = self.0.inner.borrow();
inner.renderer.sprite_atlas().clone()
}
}