-
Notifications
You must be signed in to change notification settings - Fork 791
Add support for setting custom bitmap cursors #10270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
redstrate
wants to merge
1
commit into
slint-ui:master
Choose a base branch
from
redstrate:work/josh/custom-cursor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,7 +47,7 @@ use i_slint_core::{self as corelib}; | |
| use std::cell::OnceCell; | ||
| #[cfg(any(enable_accesskit, muda))] | ||
| use winit::event_loop::EventLoopProxy; | ||
| use winit::window::{WindowAttributes, WindowButtons}; | ||
| use winit::window::{CustomCursor, CustomCursorSource, WindowAttributes, WindowButtons}; | ||
|
|
||
| pub(crate) fn position_to_winit(pos: &corelib::api::WindowPosition) -> winit::dpi::Position { | ||
| match pos { | ||
|
|
@@ -368,6 +368,8 @@ pub struct WinitWindowAdapter { | |
| window_icon_cache_key: RefCell<Option<ImageCacheKey>>, | ||
|
|
||
| frame_throttle: Box<dyn crate::frame_throttle::FrameThrottle>, | ||
|
|
||
| pub(crate) custom_cursor_source: Cell<Option<CustomCursorSource>>, | ||
| } | ||
|
|
||
| impl WinitWindowAdapter { | ||
|
|
@@ -416,6 +418,7 @@ impl WinitWindowAdapter { | |
| self_weak.clone(), | ||
| shared_backend_data.is_wayland, | ||
| ), | ||
| custom_cursor_source: Cell::new(None), | ||
| }); | ||
|
|
||
| self_rc.shared_backend_data.register_inactive_window((self_rc.clone()) as _); | ||
|
|
@@ -1324,41 +1327,66 @@ impl WindowAdapter for WinitWindowAdapter { | |
|
|
||
| impl WindowAdapterInternal for WinitWindowAdapter { | ||
| fn set_mouse_cursor(&self, cursor: MouseCursor) { | ||
| let winit_cursor = match cursor { | ||
| MouseCursor::Default => winit::window::CursorIcon::Default, | ||
| MouseCursor::None => winit::window::CursorIcon::Default, | ||
| MouseCursor::Help => winit::window::CursorIcon::Help, | ||
| MouseCursor::Pointer => winit::window::CursorIcon::Pointer, | ||
| MouseCursor::Progress => winit::window::CursorIcon::Progress, | ||
| MouseCursor::Wait => winit::window::CursorIcon::Wait, | ||
| MouseCursor::Crosshair => winit::window::CursorIcon::Crosshair, | ||
| MouseCursor::Text => winit::window::CursorIcon::Text, | ||
| MouseCursor::Alias => winit::window::CursorIcon::Alias, | ||
| MouseCursor::Copy => winit::window::CursorIcon::Copy, | ||
| MouseCursor::Move => winit::window::CursorIcon::Move, | ||
| MouseCursor::NoDrop => winit::window::CursorIcon::NoDrop, | ||
| MouseCursor::NotAllowed => winit::window::CursorIcon::NotAllowed, | ||
| MouseCursor::Grab => winit::window::CursorIcon::Grab, | ||
| MouseCursor::Grabbing => winit::window::CursorIcon::Grabbing, | ||
| MouseCursor::ColResize => winit::window::CursorIcon::ColResize, | ||
| MouseCursor::RowResize => winit::window::CursorIcon::RowResize, | ||
| MouseCursor::NResize => winit::window::CursorIcon::NResize, | ||
| MouseCursor::EResize => winit::window::CursorIcon::EResize, | ||
| MouseCursor::SResize => winit::window::CursorIcon::SResize, | ||
| MouseCursor::WResize => winit::window::CursorIcon::WResize, | ||
| MouseCursor::NeResize => winit::window::CursorIcon::NeResize, | ||
| MouseCursor::NwResize => winit::window::CursorIcon::NwResize, | ||
| MouseCursor::SeResize => winit::window::CursorIcon::SeResize, | ||
| MouseCursor::SwResize => winit::window::CursorIcon::SwResize, | ||
| MouseCursor::EwResize => winit::window::CursorIcon::EwResize, | ||
| MouseCursor::NsResize => winit::window::CursorIcon::NsResize, | ||
| MouseCursor::NeswResize => winit::window::CursorIcon::NeswResize, | ||
| MouseCursor::NwseResize => winit::window::CursorIcon::NwseResize, | ||
| _ => winit::window::CursorIcon::Default, | ||
| let winit_cursor = match &cursor { | ||
| MouseCursor::Default => Some(winit::window::CursorIcon::Default), | ||
| MouseCursor::None => Some(winit::window::CursorIcon::Default), | ||
| MouseCursor::Help => Some(winit::window::CursorIcon::Help), | ||
| MouseCursor::Pointer => Some(winit::window::CursorIcon::Pointer), | ||
| MouseCursor::Progress => Some(winit::window::CursorIcon::Progress), | ||
| MouseCursor::Wait => Some(winit::window::CursorIcon::Wait), | ||
| MouseCursor::Crosshair => Some(winit::window::CursorIcon::Crosshair), | ||
| MouseCursor::Text => Some(winit::window::CursorIcon::Text), | ||
| MouseCursor::Alias => Some(winit::window::CursorIcon::Alias), | ||
| MouseCursor::Copy => Some(winit::window::CursorIcon::Copy), | ||
| MouseCursor::Move => Some(winit::window::CursorIcon::Move), | ||
| MouseCursor::NoDrop => Some(winit::window::CursorIcon::NoDrop), | ||
| MouseCursor::NotAllowed => Some(winit::window::CursorIcon::NotAllowed), | ||
| MouseCursor::Grab => Some(winit::window::CursorIcon::Grab), | ||
| MouseCursor::Grabbing => Some(winit::window::CursorIcon::Grabbing), | ||
| MouseCursor::ColResize => Some(winit::window::CursorIcon::ColResize), | ||
| MouseCursor::RowResize => Some(winit::window::CursorIcon::RowResize), | ||
| MouseCursor::NResize => Some(winit::window::CursorIcon::NResize), | ||
| MouseCursor::EResize => Some(winit::window::CursorIcon::EResize), | ||
| MouseCursor::SResize => Some(winit::window::CursorIcon::SResize), | ||
| MouseCursor::WResize => Some(winit::window::CursorIcon::WResize), | ||
| MouseCursor::NeResize => Some(winit::window::CursorIcon::NeResize), | ||
| MouseCursor::NwResize => Some(winit::window::CursorIcon::NwResize), | ||
| MouseCursor::SeResize => Some(winit::window::CursorIcon::SeResize), | ||
| MouseCursor::SwResize => Some(winit::window::CursorIcon::SwResize), | ||
| MouseCursor::EwResize => Some(winit::window::CursorIcon::EwResize), | ||
| MouseCursor::NsResize => Some(winit::window::CursorIcon::NsResize), | ||
| MouseCursor::NeswResize => Some(winit::window::CursorIcon::NeswResize), | ||
| MouseCursor::NwseResize => Some(winit::window::CursorIcon::NwseResize), | ||
| MouseCursor::CustomCursor { image, hotspot_x, hotspot_y } => { | ||
| if let Some(rgba8) = image.to_rgba8() { | ||
| let rgba_vec = rgba8.as_slice().to_vec(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why allocate a vector if we're going to allocate another vector in the next line? |
||
| let rgba = rgba_vec | ||
| .iter() | ||
| .map(|c| vec![c.r, c.g, c.b, c.a]) | ||
| .flatten() | ||
| .collect::<Vec<u8>>(); | ||
| let size = image.size(); | ||
| let source = CustomCursor::from_rgba( | ||
| rgba, | ||
| size.width as u16, | ||
| size.height as u16, | ||
| *hotspot_x as u16, | ||
| *hotspot_y as u16, | ||
| ); | ||
|
|
||
| // Custom cursors have to be set during the event loop | ||
| self.custom_cursor_source.set(source.ok()); | ||
| } | ||
| None | ||
| } | ||
| _ => None, | ||
| }; | ||
| if let Some(winit_window) = self.winit_window_or_none.borrow().as_window() { | ||
| winit_window.set_cursor_visible(cursor != MouseCursor::None); | ||
| winit_window.set_cursor(winit_cursor); | ||
|
|
||
| if let Some(cursor) = winit_cursor { | ||
| winit_window.set_cursor(cursor); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not happy about this change (and the sibling one in headless) but it's the only way I got it to work, since
MouseCursoris no longerCopy.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just for tests anyway so it's fine.
Maybe the tests would be a bit nicer if there was a
pub fn mouse_cursor(&self)->MouseCursor { self.mouse_cursor.borrow().clone() }getter function.(And in headless this isn't even used, so we could just remove it)