summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-04-29 03:11:15 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-04-29 03:11:15 +0200
commit59403b6ca80081fa419fbef76c92397db68f1ab1 (patch)
treea9924f7d7c194a83027a44a1848f97f351bfd20a
parent85dc07c3b00b4f6c40fcba571c067b941c868098 (diff)
downloadiced-59403b6ca80081fa419fbef76c92397db68f1ab1.tar.gz
iced-59403b6ca80081fa419fbef76c92397db68f1ab1.tar.bz2
iced-59403b6ca80081fa419fbef76c92397db68f1ab1.zip
Remove `OutOfBounds` variant from `MouseCursor`
Diffstat (limited to '')
-rw-r--r--examples/custom_widget/src/main.rs2
-rw-r--r--examples/geometry/src/main.rs2
-rw-r--r--examples/integration/src/main.rs2
-rw-r--r--native/src/mouse_cursor.rs5
-rw-r--r--wgpu/src/renderer/widget/button.rs2
-rw-r--r--wgpu/src/renderer/widget/checkbox.rs2
-rw-r--r--wgpu/src/renderer/widget/column.rs2
-rw-r--r--wgpu/src/renderer/widget/image.rs2
-rw-r--r--wgpu/src/renderer/widget/pane_grid.rs2
-rw-r--r--wgpu/src/renderer/widget/progress_bar.rs2
-rw-r--r--wgpu/src/renderer/widget/radio.rs2
-rw-r--r--wgpu/src/renderer/widget/row.rs2
-rw-r--r--wgpu/src/renderer/widget/slider.rs2
-rw-r--r--wgpu/src/renderer/widget/space.rs2
-rw-r--r--wgpu/src/renderer/widget/svg.rs2
-rw-r--r--wgpu/src/renderer/widget/text.rs2
-rw-r--r--wgpu/src/renderer/widget/text_input.rs2
-rw-r--r--winit/src/application.rs2
-rw-r--r--winit/src/conversion.rs1
19 files changed, 18 insertions, 22 deletions
diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs
index 0a570745..d0bceb73 100644
--- a/examples/custom_widget/src/main.rs
+++ b/examples/custom_widget/src/main.rs
@@ -66,7 +66,7 @@ mod circle {
border_width: 0,
border_color: Color::TRANSPARENT,
},
- MouseCursor::OutOfBounds,
+ MouseCursor::default(),
)
}
}
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 795cac27..2a3efd4a 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -141,7 +141,7 @@ mod rainbow {
},
}),
},
- MouseCursor::OutOfBounds,
+ MouseCursor::default(),
)
}
}
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 7203d4b6..da571ed1 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -63,7 +63,7 @@ pub fn main() {
let mut events = Vec::new();
let mut cache = Some(Cache::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);
// Initialize scene and GUI controls
diff --git a/native/src/mouse_cursor.rs b/native/src/mouse_cursor.rs
index 0dad3edc..8bfa2b44 100644
--- a/native/src/mouse_cursor.rs
+++ b/native/src/mouse_cursor.rs
@@ -1,9 +1,6 @@
/// The state of the mouse cursor.
#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
pub enum MouseCursor {
- /// The cursor is out of the bounds of the user interface.
- OutOfBounds,
-
/// The cursor is over a non-interactive widget.
Idle,
@@ -31,6 +28,6 @@ pub enum MouseCursor {
impl Default for MouseCursor {
fn default() -> MouseCursor {
- MouseCursor::OutOfBounds
+ MouseCursor::Idle
}
}
diff --git a/wgpu/src/renderer/widget/button.rs b/wgpu/src/renderer/widget/button.rs
index 359b4866..5e55873a 100644
--- a/wgpu/src/renderer/widget/button.rs
+++ b/wgpu/src/renderer/widget/button.rs
@@ -86,7 +86,7 @@ impl iced_native::button::Renderer for Renderer {
if is_mouse_over {
MouseCursor::Pointer
} else {
- MouseCursor::OutOfBounds
+ MouseCursor::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/checkbox.rs b/wgpu/src/renderer/widget/checkbox.rs
index c0f1bf21..7f7f6de3 100644
--- a/wgpu/src/renderer/widget/checkbox.rs
+++ b/wgpu/src/renderer/widget/checkbox.rs
@@ -56,7 +56,7 @@ impl checkbox::Renderer for Renderer {
if is_mouse_over {
MouseCursor::Pointer
} else {
- MouseCursor::OutOfBounds
+ MouseCursor::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/column.rs b/wgpu/src/renderer/widget/column.rs
index 95a7463a..e6a9d8f0 100644
--- a/wgpu/src/renderer/widget/column.rs
+++ b/wgpu/src/renderer/widget/column.rs
@@ -9,7 +9,7 @@ impl column::Renderer for Renderer {
layout: Layout<'_>,
cursor_position: Point,
) -> Self::Output {
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_cursor = MouseCursor::default();
(
Primitive::Group {
diff --git a/wgpu/src/renderer/widget/image.rs b/wgpu/src/renderer/widget/image.rs
index 70dc5d97..6b7f1c60 100644
--- a/wgpu/src/renderer/widget/image.rs
+++ b/wgpu/src/renderer/widget/image.rs
@@ -16,7 +16,7 @@ impl image::Renderer for Renderer {
handle,
bounds: layout.bounds(),
},
- MouseCursor::OutOfBounds,
+ MouseCursor::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/pane_grid.rs b/wgpu/src/renderer/widget/pane_grid.rs
index 11ba6347..80e2471f 100644
--- a/wgpu/src/renderer/widget/pane_grid.rs
+++ b/wgpu/src/renderer/widget/pane_grid.rs
@@ -22,7 +22,7 @@ impl pane_grid::Renderer for Renderer {
cursor_position
};
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_cursor = MouseCursor::default();
let mut dragged_pane = None;
let mut panes: Vec<_> = content
diff --git a/wgpu/src/renderer/widget/progress_bar.rs b/wgpu/src/renderer/widget/progress_bar.rs
index 34e33276..fe032fbf 100644
--- a/wgpu/src/renderer/widget/progress_bar.rs
+++ b/wgpu/src/renderer/widget/progress_bar.rs
@@ -48,7 +48,7 @@ impl progress_bar::Renderer for Renderer {
} else {
background
},
- MouseCursor::OutOfBounds,
+ MouseCursor::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/radio.rs b/wgpu/src/renderer/widget/radio.rs
index 564f066b..551700c8 100644
--- a/wgpu/src/renderer/widget/radio.rs
+++ b/wgpu/src/renderer/widget/radio.rs
@@ -57,7 +57,7 @@ impl radio::Renderer for Renderer {
if is_mouse_over {
MouseCursor::Pointer
} else {
- MouseCursor::OutOfBounds
+ MouseCursor::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/row.rs b/wgpu/src/renderer/widget/row.rs
index bd9f1a04..c6a10c07 100644
--- a/wgpu/src/renderer/widget/row.rs
+++ b/wgpu/src/renderer/widget/row.rs
@@ -9,7 +9,7 @@ impl row::Renderer for Renderer {
layout: Layout<'_>,
cursor_position: Point,
) -> Self::Output {
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_cursor = MouseCursor::default();
(
Primitive::Group {
diff --git a/wgpu/src/renderer/widget/slider.rs b/wgpu/src/renderer/widget/slider.rs
index c8ebd0da..335e1b92 100644
--- a/wgpu/src/renderer/widget/slider.rs
+++ b/wgpu/src/renderer/widget/slider.rs
@@ -99,7 +99,7 @@ impl slider::Renderer for Renderer {
} else if is_mouse_over {
MouseCursor::Grab
} else {
- MouseCursor::OutOfBounds
+ MouseCursor::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/space.rs b/wgpu/src/renderer/widget/space.rs
index 28e05437..9ec0ed6d 100644
--- a/wgpu/src/renderer/widget/space.rs
+++ b/wgpu/src/renderer/widget/space.rs
@@ -3,6 +3,6 @@ use iced_native::{space, MouseCursor, Rectangle};
impl space::Renderer for Renderer {
fn draw(&mut self, _bounds: Rectangle) -> Self::Output {
- (Primitive::None, MouseCursor::OutOfBounds)
+ (Primitive::None, MouseCursor::default())
}
}
diff --git a/wgpu/src/renderer/widget/svg.rs b/wgpu/src/renderer/widget/svg.rs
index 67bc3fe1..4ee983ea 100644
--- a/wgpu/src/renderer/widget/svg.rs
+++ b/wgpu/src/renderer/widget/svg.rs
@@ -16,7 +16,7 @@ impl svg::Renderer for Renderer {
handle,
bounds: layout.bounds(),
},
- MouseCursor::OutOfBounds,
+ MouseCursor::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index 80bff574..3cf32426 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -53,7 +53,7 @@ impl text::Renderer for Renderer {
horizontal_alignment,
vertical_alignment,
},
- MouseCursor::OutOfBounds,
+ MouseCursor::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs
index 6f72db68..97eb0114 100644
--- a/wgpu/src/renderer/widget/text_input.rs
+++ b/wgpu/src/renderer/widget/text_input.rs
@@ -234,7 +234,7 @@ impl text_input::Renderer for Renderer {
if is_mouse_over {
MouseCursor::Text
} else {
- MouseCursor::OutOfBounds
+ MouseCursor::default()
},
)
}
diff --git a/winit/src/application.rs b/winit/src/application.rs
index b974711c..ae9775f7 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -205,7 +205,7 @@ pub trait Application: Sized {
let mut cache = Some(user_interface.into_cache());
let mut events = Vec::new();
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_cursor = MouseCursor::default();
let mut modifiers = winit::event::ModifiersState::default();
debug.startup_finished();
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index eaa26ace..ae416b4c 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -110,7 +110,6 @@ pub fn fullscreen(
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
pub fn mouse_cursor(mouse_cursor: MouseCursor) -> winit::window::CursorIcon {
match mouse_cursor {
- MouseCursor::OutOfBounds => winit::window::CursorIcon::Default,
MouseCursor::Idle => winit::window::CursorIcon::Default,
MouseCursor::Pointer => winit::window::CursorIcon::Hand,
MouseCursor::Working => winit::window::CursorIcon::Progress,