windows: display icon (#9571)
Now `Zed` can display icons. The image below shows the icon of the `zed.exe` file and the icon in the right-click properties.  I used the `crates\zed\resources\app-icon@2x.png` file to generate the `.ico` file. Due to some blank space around the logo in the original file, the logo appears slightly smaller on Windows compared to other software.  The current `.ico` file contains logo files of multiple sizes: 16x16, 24x24, 32x32, 48x48, 64x64, 96x96, 128x128, 256x256, 512x512. Release Notes: - N/A
This commit is contained in:
parent
f179158913
commit
3fd62a2313
4 changed files with 28 additions and 5 deletions
|
@ -14,7 +14,7 @@ use std::{
|
|||
};
|
||||
|
||||
use ::util::{ResultExt, SemanticVersion};
|
||||
use anyhow::{anyhow, Result};
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use async_task::Runnable;
|
||||
use copypasta::{ClipboardContext, ClipboardProvider};
|
||||
use futures::channel::oneshot::{self, Receiver};
|
||||
|
@ -62,6 +62,7 @@ pub(crate) struct WindowsPlatformInner {
|
|||
pub raw_window_handles: RwLock<SmallVec<[HWND; 4]>>,
|
||||
pub(crate) dispatch_event: OwnedHandle,
|
||||
pub(crate) settings: RefCell<WindowsPlatformSystemSettings>,
|
||||
pub icon: HICON,
|
||||
}
|
||||
|
||||
impl WindowsPlatformInner {
|
||||
|
@ -156,6 +157,7 @@ impl WindowsPlatform {
|
|||
let callbacks = Mutex::new(Callbacks::default());
|
||||
let raw_window_handles = RwLock::new(SmallVec::new());
|
||||
let settings = RefCell::new(WindowsPlatformSystemSettings::new());
|
||||
let icon = load_icon().unwrap_or_default();
|
||||
let inner = Rc::new(WindowsPlatformInner {
|
||||
background_executor,
|
||||
foreground_executor,
|
||||
|
@ -165,6 +167,7 @@ impl WindowsPlatform {
|
|||
raw_window_handles,
|
||||
dispatch_event,
|
||||
settings,
|
||||
icon,
|
||||
});
|
||||
Self { inner }
|
||||
}
|
||||
|
@ -881,3 +884,19 @@ fn fallback_vsync_fn() -> impl Fn(HANDLE) -> bool + Send {
|
|||
(unsafe { WaitForSingleObject(timer_stop_event, interval) }) == WAIT_TIMEOUT
|
||||
}
|
||||
}
|
||||
|
||||
fn load_icon() -> Result<HICON> {
|
||||
let module = unsafe { GetModuleHandleW(None).context("unable to get module handle")? };
|
||||
let handle = unsafe {
|
||||
LoadImageW(
|
||||
module,
|
||||
IDI_APPLICATION,
|
||||
IMAGE_ICON,
|
||||
0,
|
||||
0,
|
||||
LR_DEFAULTSIZE | LR_SHARED,
|
||||
)
|
||||
.context("unable to load icon file")?
|
||||
};
|
||||
Ok(HICON(handle.0))
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue