leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Web: improve custom cursor loading (#3321)

Browse source
This commit is contained in:
daxpedda 2023-12-26 03:49:20 +01:00 • committed by GitHub
parent e0fea25b06
commit 25d6a1d46d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 248 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/platform_impl/web/window.rs
View file

@ -6,7 +6,6 @@ use crate::window::{
WindowAttributes, WindowButtons, WindowId as RootWI, WindowLevel,
};
use super::cursor::CursorState;
use super::main_thread::{MainThreadMarker, MainThreadSafe};
use super::r#async::Dispatcher;
use super::{backend, monitor::MonitorHandle, EventLoopWindowTarget, Fullscreen};
@ -25,7 +24,6 @@ pub struct Inner {
id: WindowId,
pub window: web_sys::Window,
canvas: Rc<RefCell<backend::Canvas>>,
cursor: CursorState,
destroy_fn: Option<Box<dyn FnOnce()>>,
}
@ -41,6 +39,7 @@ impl Window {
let document = target.runner.document();
let canvas = backend::Canvas::create(
target.runner.main_thread(),
target.runner.weak(),
id,
window.clone(),
document.clone(),
@ -48,7 +47,6 @@ impl Window {
platform_attr,
)?;
let canvas = Rc::new(RefCell::new(canvas));
let cursor = CursorState::new(target.runner.main_thread(), canvas.borrow().style().clone());
target.register(&canvas, id);
@ -59,7 +57,6 @@ impl Window {
id,
window: window.clone(),
canvas,
cursor,
destroy_fn: Some(destroy_fn),
};
@ -227,7 +224,7 @@ impl Inner {
#[inline]
pub fn set_cursor(&self, cursor: Cursor) {
self.cursor.set_cursor(cursor)
self.canvas.borrow_mut().cursor.set_cursor(cursor)
}
#[inline]
@ -253,7 +250,7 @@ impl Inner {
#[inline]
pub fn set_cursor_visible(&self, visible: bool) {
self.cursor.set_cursor_visible(visible)
self.canvas.borrow_mut().cursor.set_cursor_visible(visible)
}
#[inline]