pxlman
/
Acord
forked from jess/Acord
1
0
Fork 0
Code Pull Requests Activity

Drop winapi, fix types for muda, clean up warnings.

This commit is contained in:
jess 2026-04-17 22:08:55 -07:00
parent 46b4b7865d
commit 7d139570b2
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
viewport/src/handle.rs
View File

@ -66,7 +66,7 @@ pub fn create(
);
#[cfg(target_os = "windows")]
let (raw_window, raw_display) = {
let mut wh = Win32WindowHandle::new(std::num::NonZero::new(ptr.as_ptr() as isize).unwrap());
let wh = Win32WindowHandle::new(std::num::NonZero::new(ptr.as_ptr() as isize).unwrap());
(
RawWindowHandle::Win32(wh),
RawDisplayHandle::Windows(WindowsDisplayHandle::new()),

3
windows/Cargo.toml
View File

@ -21,8 +21,5 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
dirs = "6"
[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winuser"] }
[target.'cfg(windows)'.build-dependencies]
winres = "0.1"

12
windows/src/app.rs
View File

@ -11,8 +11,8 @@ use acord_viewport::{
viewport_create, viewport_destroy, viewport_render, viewport_resize,
viewport_set_text, viewport_get_text, viewport_set_theme, viewport_set_lang,
viewport_set_line_indicator, viewport_set_gutter_rainbow,
viewport_send_command, viewport_free_string, viewport_render_mode,
viewport_export_crate, ViewportHandle,
viewport_send_command, viewport_free_string,
ViewportHandle,
};
use crate::config::Config;
@ -174,12 +174,8 @@ impl ApplicationHandler for App {
let app_menu = AppMenu::new();
#[cfg(target_os = "windows")]
{
use raw_window_handle::HasWindowHandle;
if let Ok(wh) = window.window_handle() {
if let raw_window_handle::RawWindowHandle::Win32(h) = wh.as_raw() {
use winapi::shared::windef::HWND;
app_menu.menu.init_for_hwnd(h.hwnd.get() as HWND).ok();
}
if let raw_window_handle::RawWindowHandle::Win32(h) = raw {
unsafe { app_menu.menu.init_for_hwnd(h.hwnd.get()).ok(); }
}
}
self.menu = Some(app_menu);