Skip to content
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.

Sign up for GitHub

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

feat: add Hide variant to mouse Interaction #172

Merged
merged 1 commit into from
Oct 7, 2024
Merged

feat: add Hide variant to mouse Interaction #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/mouse/interaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ pub enum Interaction {
ResizingHorizontally,
ResizingVertically,
NotAllowed,
Hide,
}
7 changes: 4 additions & 3 deletions sctk/src/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ pub fn modifiers_to_native(mods: Modifiers) -> keyboard::Modifiers {
// key_conversion.get(&keysym).cloned()
// }

pub(crate) fn cursor_icon(cursor: Interaction) -> CursorIcon {
match cursor {
pub(crate) fn cursor_icon(cursor: Interaction) -> Option<CursorIcon> {
Some(match cursor {
Interaction::Idle => CursorIcon::Default,
Interaction::Pointer => CursorIcon::Pointer,
Interaction::Grab => CursorIcon::Grab,
Expand All @@ -92,5 +92,6 @@ pub(crate) fn cursor_icon(cursor: Interaction) -> CursorIcon {
Interaction::ResizingHorizontally => CursorIcon::EwResize,
Interaction::ResizingVertically => CursorIcon::NsResize,
Interaction::NotAllowed => CursorIcon::NotAllowed,
}
Interaction::Hide => return None,
})
}
12 changes: 9 additions & 3 deletions sctk/src/event_loop/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,9 +842,15 @@ where
},
Event::SetCursor(iced_icon) => {
if let Some(seat) = self.state.seats.get_mut(0) {
let icon = conversion::cursor_icon(iced_icon);
seat.icon = Some(icon);
seat.set_cursor(self.wayland_dispatcher.as_source_ref().connection(), icon);
if let Some(icon) = conversion::cursor_icon(iced_icon) {
seat.icon = Some(icon);
seat.set_cursor(self.wayland_dispatcher.as_source_ref().connection(), icon);
} else {
if let Some(ptr) = seat.ptr.as_ref() {
_ = ptr.hide_cursor();
}
}

}

}
Expand Down
14 changes: 11 additions & 3 deletions winit/src/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
use std::mem::ManuallyDrop;
use std::sync::Arc;

#[cfg(feature = "trace")]

Check warning on line 46 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / web 

unexpected `cfg` condition value: `trace`

Check warning on line 46 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / web 

unexpected `cfg` condition value: `trace`

Check warning on line 46 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / wasm 

unexpected `cfg` condition value: `trace`

Check warning on line 46 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / wasm 

unexpected `cfg` condition value: `trace`
pub use profiler::Profiler;
#[cfg(feature = "trace")]

Check warning on line 48 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / web 

unexpected `cfg` condition value: `trace`

Check warning on line 48 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / web 

unexpected `cfg` condition value: `trace`

Check warning on line 48 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / wasm 

unexpected `cfg` condition value: `trace`

Check warning on line 48 in winit/src/application.rs

View workflow job for this annotation

GitHub Actions / wasm 

unexpected `cfg` condition value: `trace`
use tracing::{info_span, instrument::Instrument};

/// Wrapper aroun application Messages to allow for more UserEvent variants
Expand Down Expand Up @@ -691,9 +691,17 @@
debug.draw_finished();

if new_mouse_interaction != mouse_interaction {
window.set_cursor_icon(conversion::mouse_interaction(
new_mouse_interaction,
));
if let Some(interation) =
conversion::mouse_interaction(new_mouse_interaction)
{
if matches!(mouse_interaction, mouse::Interaction::Hide)
{
window.set_cursor_visible(true);
}
window.set_cursor_icon(interation);
} else {
window.set_cursor_visible(false);
}

mouse_interaction = new_mouse_interaction;
}
Expand Down
7 changes: 4 additions & 3 deletions winit/src/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! [`winit`]: https://github.com/rust-windowing/winit
//! [`iced_runtime`]: https://github.com/iced-rs/iced/tree/0.10/runtime
use winit::keyboard::SmolStr;
use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;

Check failure on line 6 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::modifier_supplement`

Check failure on line 6 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::modifier_supplement`

Check failure on line 6 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::modifier_supplement`

Check failure on line 6 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::modifier_supplement`

use crate::core::keyboard;
use crate::core::mouse;
Expand Down Expand Up @@ -200,7 +200,7 @@
},
WindowEvent::KeyboardInput { event, .. } => {
let text_with_modifiers =
event.text_with_all_modifiers().map(|t| SmolStr::new(t));

Check failure on line 203 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `text_with_all_modifiers` found for struct `KeyEvent` in the current scope

Check failure on line 203 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `text_with_all_modifiers` found for struct `KeyEvent` in the current scope

Check failure on line 203 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `text_with_all_modifiers` found for struct `KeyEvent` in the current scope

Check failure on line 203 in winit/src/conversion.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `text_with_all_modifiers` found for struct `KeyEvent` in the current scope
let winit::event::KeyEvent {
logical_key,
state,
Expand Down Expand Up @@ -375,10 +375,10 @@
/// [`winit`]: https://github.com/rust-windowing/winit
pub fn mouse_interaction(
interaction: mouse::Interaction,
) -> winit::window::CursorIcon {
) -> Option<winit::window::CursorIcon> {
use mouse::Interaction;

match interaction {
Some(match interaction {
Interaction::Idle => winit::window::CursorIcon::Default,
Interaction::Pointer => winit::window::CursorIcon::Pointer,
Interaction::Working => winit::window::CursorIcon::Progress,
Expand All @@ -391,7 +391,8 @@
}
Interaction::ResizingVertically => winit::window::CursorIcon::NsResize,
Interaction::NotAllowed => winit::window::CursorIcon::NotAllowed,
}
Interaction::Hide => return None,
})
}

/// Converts a `MouseButton` from [`winit`] to an [`iced`] mouse button.
Expand Down
48 changes: 39 additions & 9 deletions winit/src/multi_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,11 +575,21 @@ async fn run_instance<A, E, C>(
debug.draw_finished();

if new_mouse_interaction != window.mouse_interaction {
window.raw.set_cursor_icon(
if let Some(interation) =
conversion::mouse_interaction(
new_mouse_interaction,
),
);
)
{
if matches!(
window.mouse_interaction,
mouse::Interaction::Hide
) {
window.raw.set_cursor_visible(true);
}
window.raw.set_cursor_icon(interation);
} else {
window.raw.set_cursor_visible(false);
}

window.mouse_interaction = new_mouse_interaction;
}
Expand Down Expand Up @@ -650,11 +660,21 @@ async fn run_instance<A, E, C>(

if new_mouse_interaction != window.mouse_interaction
{
window.raw.set_cursor_icon(
if let Some(interation) =
conversion::mouse_interaction(
new_mouse_interaction,
),
);
)
{
if matches!(
window.mouse_interaction,
mouse::Interaction::Hide
) {
window.raw.set_cursor_visible(true);
}
window.raw.set_cursor_icon(interation);
} else {
window.raw.set_cursor_visible(false);
}

window.mouse_interaction =
new_mouse_interaction;
Expand Down Expand Up @@ -916,11 +936,21 @@ async fn run_instance<A, E, C>(

if new_mouse_interaction != window.mouse_interaction
{
window.raw.set_cursor_icon(
if let Some(interation) =
conversion::mouse_interaction(
new_mouse_interaction,
),
);
)
{
if matches!(
window.mouse_interaction,
mouse::Interaction::Hide
) {
window.raw.set_cursor_visible(true);
}
window.raw.set_cursor_icon(interation);
} else {
window.raw.set_cursor_visible(false);
}

window.mouse_interaction =
new_mouse_interaction;
Expand Down
Loading