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

8
src/platform/windows/window.rs
View file

@ -438,21 +438,21 @@ impl Window {
get_window_scale_factor(self.window.0, self.window.1)
}
fn set_cursor_position_physical(&self, x: i32, y: i32) -> Result<(), ()> {
fn set_cursor_position_physical(&self, x: i32, y: i32) -> Result<(), String> {
let mut point = POINT { x, y };
unsafe {
if winuser::ClientToScreen(self.window.0, &mut point) == 0 {
return Err(());
return Err("`ClientToScreen` failed".to_owned());
}
if winuser::SetCursorPos(point.x, point.y) == 0 {
return Err(());
return Err("`SetCursorPos` failed".to_owned());
}
}
Ok(())
}
#[inline]
pub fn set_cursor_position(&self, logical_position: LogicalPosition) -> Result<(), ()> {
pub fn set_cursor_position(&self, logical_position: LogicalPosition) -> Result<(), String> {
let dpi_factor = self.get_hidpi_factor();
let (x, y) = logical_position.to_physical(dpi_factor).into();
self.set_cursor_position_physical(x, y)