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/x11/window.rs
View file

@ -1113,7 +1113,7 @@ impl UnownedWindow {
self.get_current_monitor().hidpi_factor
}
pub(crate) fn set_cursor_position_physical(&self, x: i32, y: i32) -> Result<(), ()> {
pub fn set_cursor_position_physical(&self, x: i32, y: i32) -> Result<(), String> {
unsafe {
(self.xconn.xlib.XWarpPointer)(
self.xconn.display,
@ -1126,12 +1126,12 @@ impl UnownedWindow {
x,
y,
);
self.xconn.flush_requests().map_err(|_| ())
self.xconn.flush_requests().map_err(|e| format!("`XWarpPointer` failed: {:?}", e))
}
}
#[inline]
pub fn set_cursor_position(&self, logical_position: LogicalPosition) -> Result<(), ()> {
pub fn set_cursor_position(&self, logical_position: LogicalPosition) -> Result<(), String> {
let (x, y) = logical_position.to_physical(self.get_hidpi_factor()).into();
self.set_cursor_position_physical(x, y)
}