Remove OutOfBounds variant from MouseCursor

This commit is contained in:
Héctor Ramón Jiménez 2020-04-29 03:11:15 +02:00
parent 85dc07c3b0
commit 59403b6ca8
19 changed files with 18 additions and 22 deletions

View File

@ -66,7 +66,7 @@ mod circle {
border_width: 0, border_width: 0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
MouseCursor::OutOfBounds, MouseCursor::default(),
) )
} }
} }

View File

@ -141,7 +141,7 @@ mod rainbow {
}, },
}), }),
}, },
MouseCursor::OutOfBounds, MouseCursor::default(),
) )
} }
} }

View File

@ -63,7 +63,7 @@ pub fn main() {
let mut events = Vec::new(); let mut events = Vec::new();
let mut cache = Some(Cache::default()); let mut cache = Some(Cache::default());
let mut renderer = Renderer::new(&mut device, Settings::default()); let mut renderer = Renderer::new(&mut device, Settings::default());
let mut output = (Primitive::None, MouseCursor::OutOfBounds); let mut output = (Primitive::None, MouseCursor::default());
let clipboard = Clipboard::new(&window); let clipboard = Clipboard::new(&window);
// Initialize scene and GUI controls // Initialize scene and GUI controls

View File

@ -1,9 +1,6 @@
/// The state of the mouse cursor. /// The state of the mouse cursor.
#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)] #[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
pub enum MouseCursor { pub enum MouseCursor {
/// The cursor is out of the bounds of the user interface.
OutOfBounds,
/// The cursor is over a non-interactive widget. /// The cursor is over a non-interactive widget.
Idle, Idle,
@ -31,6 +28,6 @@ pub enum MouseCursor {
impl Default for MouseCursor { impl Default for MouseCursor {
fn default() -> MouseCursor { fn default() -> MouseCursor {
MouseCursor::OutOfBounds MouseCursor::Idle
} }
} }

View File

@ -86,7 +86,7 @@ impl iced_native::button::Renderer for Renderer {
if is_mouse_over { if is_mouse_over {
MouseCursor::Pointer MouseCursor::Pointer
} else { } else {
MouseCursor::OutOfBounds MouseCursor::default()
}, },
) )
} }

View File

@ -56,7 +56,7 @@ impl checkbox::Renderer for Renderer {
if is_mouse_over { if is_mouse_over {
MouseCursor::Pointer MouseCursor::Pointer
} else { } else {
MouseCursor::OutOfBounds MouseCursor::default()
}, },
) )
} }

View File

@ -9,7 +9,7 @@ impl column::Renderer for Renderer {
layout: Layout<'_>, layout: Layout<'_>,
cursor_position: Point, cursor_position: Point,
) -> Self::Output { ) -> Self::Output {
let mut mouse_cursor = MouseCursor::OutOfBounds; let mut mouse_cursor = MouseCursor::default();
( (
Primitive::Group { Primitive::Group {

View File

@ -16,7 +16,7 @@ impl image::Renderer for Renderer {
handle, handle,
bounds: layout.bounds(), bounds: layout.bounds(),
}, },
MouseCursor::OutOfBounds, MouseCursor::default(),
) )
} }
} }

View File

@ -22,7 +22,7 @@ impl pane_grid::Renderer for Renderer {
cursor_position cursor_position
}; };
let mut mouse_cursor = MouseCursor::OutOfBounds; let mut mouse_cursor = MouseCursor::default();
let mut dragged_pane = None; let mut dragged_pane = None;
let mut panes: Vec<_> = content let mut panes: Vec<_> = content

View File

@ -48,7 +48,7 @@ impl progress_bar::Renderer for Renderer {
} else { } else {
background background
}, },
MouseCursor::OutOfBounds, MouseCursor::default(),
) )
} }
} }

View File

@ -57,7 +57,7 @@ impl radio::Renderer for Renderer {
if is_mouse_over { if is_mouse_over {
MouseCursor::Pointer MouseCursor::Pointer
} else { } else {
MouseCursor::OutOfBounds MouseCursor::default()
}, },
) )
} }

View File

@ -9,7 +9,7 @@ impl row::Renderer for Renderer {
layout: Layout<'_>, layout: Layout<'_>,
cursor_position: Point, cursor_position: Point,
) -> Self::Output { ) -> Self::Output {
let mut mouse_cursor = MouseCursor::OutOfBounds; let mut mouse_cursor = MouseCursor::default();
( (
Primitive::Group { Primitive::Group {

View File

@ -99,7 +99,7 @@ impl slider::Renderer for Renderer {
} else if is_mouse_over { } else if is_mouse_over {
MouseCursor::Grab MouseCursor::Grab
} else { } else {
MouseCursor::OutOfBounds MouseCursor::default()
}, },
) )
} }

View File

@ -3,6 +3,6 @@ use iced_native::{space, MouseCursor, Rectangle};
impl space::Renderer for Renderer { impl space::Renderer for Renderer {
fn draw(&mut self, _bounds: Rectangle) -> Self::Output { fn draw(&mut self, _bounds: Rectangle) -> Self::Output {
(Primitive::None, MouseCursor::OutOfBounds) (Primitive::None, MouseCursor::default())
} }
} }

View File

@ -16,7 +16,7 @@ impl svg::Renderer for Renderer {
handle, handle,
bounds: layout.bounds(), bounds: layout.bounds(),
}, },
MouseCursor::OutOfBounds, MouseCursor::default(),
) )
} }
} }

View File

@ -53,7 +53,7 @@ impl text::Renderer for Renderer {
horizontal_alignment, horizontal_alignment,
vertical_alignment, vertical_alignment,
}, },
MouseCursor::OutOfBounds, MouseCursor::default(),
) )
} }
} }

View File

@ -234,7 +234,7 @@ impl text_input::Renderer for Renderer {
if is_mouse_over { if is_mouse_over {
MouseCursor::Text MouseCursor::Text
} else { } else {
MouseCursor::OutOfBounds MouseCursor::default()
}, },
) )
} }

View File

@ -205,7 +205,7 @@ pub trait Application: Sized {
let mut cache = Some(user_interface.into_cache()); let mut cache = Some(user_interface.into_cache());
let mut events = Vec::new(); let mut events = Vec::new();
let mut mouse_cursor = MouseCursor::OutOfBounds; let mut mouse_cursor = MouseCursor::default();
let mut modifiers = winit::event::ModifiersState::default(); let mut modifiers = winit::event::ModifiersState::default();
debug.startup_finished(); debug.startup_finished();

View File

@ -110,7 +110,6 @@ pub fn fullscreen(
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native /// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
pub fn mouse_cursor(mouse_cursor: MouseCursor) -> winit::window::CursorIcon { pub fn mouse_cursor(mouse_cursor: MouseCursor) -> winit::window::CursorIcon {
match mouse_cursor { match mouse_cursor {
MouseCursor::OutOfBounds => winit::window::CursorIcon::Default,
MouseCursor::Idle => winit::window::CursorIcon::Default, MouseCursor::Idle => winit::window::CursorIcon::Default,
MouseCursor::Pointer => winit::window::CursorIcon::Hand, MouseCursor::Pointer => winit::window::CursorIcon::Hand,
MouseCursor::Working => winit::window::CursorIcon::Progress, MouseCursor::Working => winit::window::CursorIcon::Progress,