Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions crates/overlay/src/backend/window/proc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,15 +404,14 @@ fn process_wnd_proc(
));
}

if comp.contains(ime::GCS_RESULTSTR) {
if let Some(text) = get_ime_string(himc, ime::GCS_RESULTSTR) {
if comp.contains(ime::GCS_RESULTSTR)
&& let Some(text) = get_ime_string(himc, ime::GCS_RESULTSTR) {
proc.ime = ImeState::Enabled;
OverlayEventSink::emit(keyboard_input(
backend.id,
KeyboardInput::Ime(Ime::Commit(text.to_utf8())),
));
}
}

if comp.0 & (ime::GCS_COMPSTR | ime::GCS_COMPATTR | ime::GCS_CURSORPOS).0 != 0 {
let caret = if !comp.contains(IME_COMPOSITION_STRING(ime::CS_NOMOVECARET))
Expand Down
5 changes: 2 additions & 3 deletions crates/overlay/src/hook/dx/dxgi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ fn draw_overlay(swapchain: &IDXGISwapChain1) {
) {
error!("Backends::with_or_init_backend failed. err: {:?}", _err);
}
} else if let Ok(device) = unsafe { swapchain.GetDevice::<ID3D11Device1>() } {
if let Err(_err) = Backends::with_or_init_backend(
} else if let Ok(device) = unsafe { swapchain.GetDevice::<ID3D11Device1>() }
&& let Err(_err) = Backends::with_or_init_backend(
hwnd.0 as _,
|| unsafe { device.cast::<IDXGIDevice>().unwrap().GetAdapter().ok() },
|backend| {
Expand All @@ -69,7 +69,6 @@ fn draw_overlay(swapchain: &IDXGISwapChain1) {
) {
error!("Backends::with_or_init_backend failed. err: {:?}", _err);
}
}
}

#[tracing::instrument]
Expand Down
5 changes: 2 additions & 3 deletions crates/overlay/src/hook/opengl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,13 @@ fn draw_overlay(hdc: HDC) {
let size = surface.size();
let position = render.position;
let screen = render.window_size;
if render.surface.invalidate_update() {
if let Err(err) =
if render.surface.invalidate_update()
&& let Err(err) =
renderer.update_texture(render.surface.get().map(|surface| surface.texture()))
{
error!("failed to update opengl texture. err: {err:?}");
return;
}
}

let _res = renderer.draw(position, size, screen);
trace!("opengl render: {:?}", _res);
Expand Down
Loading