leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change set_cursor_position to return Result<(), String> (#562)

Browse source 
* Change set_cursor_position to return Result<(), String>

This is now consistent with `grab_cursor`, and
enables `window.set_cursor_position(x, y)?` in functions
that return `Result<_, Box<Error>>`.

* Adjust error handling of unimplemented cusor opertions in wayland

* The final nitpick

* Actually one more
This commit is contained in:
aloucks 2018-06-19 10:30:15 -04:00 • committed by Francesca Frangipane
parent fb7528c239
commit 8f394f117b
10 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/platform/linux/mod.rs
View file

@ -251,7 +251,7 @@ impl Window {
pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
match self {
&Window::X(ref window) => window.grab_cursor(grab),
&Window::Wayland(ref _window) => Err("Cursor grabbing is not yet possible on Wayland.".to_owned()),
&Window::Wayland(ref window) => window.grab_cursor(grab),
}
}
@ -259,7 +259,7 @@ impl Window {
pub fn hide_cursor(&self, hide: bool) {
match self {
&Window::X(ref window) => window.hide_cursor(hide),
&Window::Wayland(ref _window) => unimplemented!(),
&Window::Wayland(ref window) => window.hide_cursor(hide),
}
}
@ -272,7 +272,7 @@ impl Window {
}
#[inline]
pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), ()> {
pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), String> {
match self {
&Window::X(ref w) => w.set_cursor_position(position),
&Window::Wayland(ref w) => w.set_cursor_position(position),