mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-03 23:27:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

windows: fix window activate action (#9664)

Browse source 
Now, the window activation event can be triggered correctly. As shown in
the video, when the window is activated, the caret blinks; when the
window loses activation due to me clicking on the PowerShell window, the
caret stops blinking.



https://github.com/zed-industries/zed/assets/14981363/4c1b2bec-319d-4f21-879e-5a0af0a00d8e



Release Notes:

- N/A
This commit is contained in:
张小白 2024-03-22 06:24:17 +08:00 committed by GitHub
parent eaa803298e
commit 4183805a39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/gpui/src/platform/windows/platform.rs
View file

@ -10,7 +10,6 @@ use std::{
path::{Path, PathBuf},
rc::Rc,
sync::{Arc, OnceLock},
time::Duration,
};
use ::util::{ResultExt, SemanticVersion};

32
crates/gpui/src/platform/windows/window.rs
View file

@ -192,9 +192,8 @@ impl WindowsWindowInner {
fn handle_msg(&self, msg: u32, wparam: WPARAM, lparam: LPARAM) -> LRESULT {
let handled = match msg {
WM_ACTIVATE => self.handle_activate_msg(),
WM_ACTIVATE => self.handle_activate_msg(wparam),
WM_CREATE => self.handle_create_msg(lparam),
WM_SETFOCUS => self.handle_set_focus_msg(msg, wparam, lparam),
WM_MOVE => self.handle_move_msg(lparam),
WM_SIZE => self.handle_size_msg(lparam),
WM_NCCALCSIZE => self.handle_calc_client_size(wparam, lparam),
@ -833,12 +832,17 @@ impl WindowsWindowInner {
Some(0)
}
fn handle_activate_msg(&self) -> Option<isize> {
fn handle_activate_msg(&self, wparam: WPARAM) -> Option<isize> {
if self.hide_title_bar {
if let Some(titlebar_rect) = self.get_titlebar_rect().log_err() {
unsafe { InvalidateRect(self.hwnd, Some(&titlebar_rect), FALSE) };
}
}
let activated = wparam.loword() > 0;
let mut callbacks = self.callbacks.borrow_mut();
if let Some(mut cb) = callbacks.active_status_change.as_mut() {
cb(activated);
}
None
}
@ -1067,28 +1071,6 @@ impl WindowsWindowInner {
None
}
fn handle_set_focus_msg(&self, _msg: u32, wparam: WPARAM, _lparam: LPARAM) -> Option<isize> {
// wparam is the window that just lost focus (may be null)
// SEE: https://learn.microsoft.com/en-us/windows/win32/inputdev/wm-setfocus
let lost_focus_hwnd = HWND(wparam.0 as isize);
if let Some(lost_focus_window) = self
.platform_inner
.try_get_windows_inner_from_hwnd(lost_focus_hwnd)
{
let mut callbacks = lost_focus_window.callbacks.borrow_mut();
if let Some(mut cb) = callbacks.active_status_change.as_mut() {
cb(false);
}
}
let mut callbacks = self.callbacks.borrow_mut();
if let Some(mut cb) = callbacks.active_status_change.as_mut() {
cb(true);
}
Some(0)
}
}
#[derive(Default)]