Move MouseCursor to iced_wgpu

This commit is contained in:
Héctor Ramón Jiménez 2019-10-05 03:58:23 +02:00
parent a7d1194403
commit a90f7fcb98
6 changed files with 5 additions and 10 deletions

View file

@ -103,7 +103,7 @@ where
/// #
/// # mod iced_wgpu {
/// # use iced_native::{
/// # button, row, Button, MouseCursor, Node, Point, Rectangle, Style, Layout, Row
/// # button, row, Button, Node, Point, Rectangle, Style, Layout, Row
/// # };
/// # pub struct Renderer;
/// #

View file

@ -77,8 +77,7 @@
//! #
//! # mod iced_wgpu {
//! # use iced_native::{
//! # button, text, Button, Text,
//! # MouseCursor, Node, Point, Rectangle, Style, Color, Layout
//! # button, text, Button, Text, Node, Point, Rectangle, Style, Color, Layout
//! # };
//! #
//! # pub struct Renderer {}
@ -207,7 +206,6 @@ mod element;
mod event;
mod hasher;
mod layout;
mod mouse_cursor;
mod node;
mod style;
mod user_interface;
@ -223,7 +221,6 @@ pub use element::Element;
pub use event::Event;
pub use hasher::Hasher;
pub use layout::Layout;
pub use mouse_cursor::MouseCursor;
pub use node::Node;
pub use renderer::Renderer;
pub use style::Style;

View file

@ -1,35 +0,0 @@
/// The state of the mouse cursor.
#[derive(Debug, Eq, PartialEq, Clone, Copy)]
pub enum MouseCursor {
/// The cursor is out of the bounds of the user interface.
OutOfBounds,
/// The cursor is over a non-interactive widget.
Idle,
/// The cursor is over a clickable widget.
Pointer,
/// The cursor is over a busy widget.
Working,
/// The cursor is over a grabbable widget.
Grab,
/// The cursor is grabbing a widget.
Grabbing,
}
#[cfg(feature = "winit")]
impl From<MouseCursor> for winit::window::CursorIcon {
fn from(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,
MouseCursor::Grab => winit::window::CursorIcon::Grab,
MouseCursor::Grabbing => winit::window::CursorIcon::Grabbing,
}
}
}

View file

@ -1,6 +1,6 @@
//! Display images in your user interface.
use crate::{Element, Hasher, Layout, MouseCursor, Node, Point, Widget};
use crate::{Element, Hasher, Layout, Node, Point, Widget};
use std::hash::Hash;

View file

@ -1,8 +1,6 @@
use std::hash::Hash;
use crate::{
Element, Event, Hasher, Layout, MouseCursor, Node, Point, Style, Widget,
};
use crate::{Element, Event, Hasher, Layout, Node, Point, Style, Widget};
/// A container that distributes its contents horizontally.
pub type Row<'a, Message, Renderer> =

View file

@ -7,7 +7,7 @@
use std::hash::Hash;
use crate::input::{mouse, ButtonState};
use crate::{Element, Event, Hasher, Layout, MouseCursor, Node, Point, Widget};
use crate::{Element, Event, Hasher, Layout, Node, Point, Widget};
pub use iced_core::slider::*;