refactor(wayland): update data in user data map for everything

This commit is contained in:
Nova
2024-08-06 20:42:46 -04:00
parent 08135b03a2
commit 14ebe85493
6 changed files with 230 additions and 204 deletions

View File

@@ -1,4 +1,4 @@
use super::{state::WaylandState, surface::CoreSurface};
use super::{state::WaylandState, surface::CoreSurface, utils::WlSurfaceExt};
use crate::{
core::task,
nodes::{
@@ -76,8 +76,7 @@ pub struct CursorInfo {
}
impl CursorInfo {
pub fn cursor_data(&self) -> Option<Geometry> {
let cursor_size =
CoreSurface::from_wl_surface(&self.surface.as_ref()?.upgrade().ok()?)?.size()?;
let cursor_size = self.surface.as_ref()?.upgrade().ok()?.get_size()?;
Some(Geometry {
origin: [self.hotspot_x, self.hotspot_y].into(),
size: cursor_size,