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

Run clippy on CI

Browse source 
Fixes #1402.
This commit is contained in:
Kirill Chibisov 2022-06-10 13:43:33 +03:00 • committed by GitHub
parent 57981b533d
commit 10419ff441
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 377 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/platform_impl/windows/event_loop.rs
View file

@ -1976,7 +1976,7 @@ unsafe fn public_window_callback_inner<T: 'static>(
false => old_physical_inner_size,
};
let _ = userdata.send_event(Event::WindowEvent {
userdata.send_event(Event::WindowEvent {
window_id: RootWindowId(WindowId(window)),
event: ScaleFactorChanged {
scale_factor: new_scale_factor,

15
src/platform_impl/windows/ime.rs
View file

@ -80,19 +80,18 @@ impl ImeContext {
let data = self.get_composition_data(gcs_mode)?;
let (prefix, shorts, suffix) = data.align_to::<u16>();
if prefix.is_empty() && suffix.is_empty() {
OsString::from_wide(&shorts).into_string().ok()
OsString::from_wide(shorts).into_string().ok()
} else {
None
}
}
unsafe fn get_composition_data(&self, gcs_mode: u32) -> Option<Vec<u8>> {
let size = ImmGetCompositionStringW(self.himc, gcs_mode, null_mut(), 0);
if size < 0 {
return None;
} else if size == 0 {
return Some(Vec::new());
}
let size = match ImmGetCompositionStringW(self.himc, gcs_mode, null_mut(), 0) {
0 => return Some(Vec::new()),
size if size < 0 => return None,
size => size,
};
let mut buf = Vec::<u8>::with_capacity(size as _);
let size = ImmGetCompositionStringW(
@ -139,7 +138,7 @@ impl ImeContext {
}
unsafe fn system_has_ime() -> bool {
return GetSystemMetrics(SM_IMMENABLED) != 0;
GetSystemMetrics(SM_IMMENABLED) != 0
}
}