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 XButton direction (#9629)

Browse source 
Release Notes:

- N/A
This commit is contained in:
白山風露 2024-03-22 01:31:19 +09:00 committed by GitHub
parent 3fd62a2313
commit e1d1d575c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,25 +211,11 @@ impl WindowsWindowInner {
WM_LBUTTONDOWN => self.handle_mouse_down_msg(MouseButton::Left, lparam),
WM_RBUTTONDOWN => self.handle_mouse_down_msg(MouseButton::Right, lparam),
WM_MBUTTONDOWN => self.handle_mouse_down_msg(MouseButton::Middle, lparam),
WM_XBUTTONDOWN => {
let nav_dir = match wparam.hiword() {
XBUTTON1 => NavigationDirection::Forward,
XBUTTON2 => NavigationDirection::Back,
_ => return LRESULT(1),
};
self.handle_mouse_down_msg(MouseButton::Navigate(nav_dir), lparam)
}
WM_XBUTTONDOWN => self.handle_xbutton_msg(wparam, lparam, Self::handle_mouse_down_msg),
WM_LBUTTONUP => self.handle_mouse_up_msg(MouseButton::Left, lparam),
WM_RBUTTONUP => self.handle_mouse_up_msg(MouseButton::Right, lparam),
WM_MBUTTONUP => self.handle_mouse_up_msg(MouseButton::Middle, lparam),
WM_XBUTTONUP => {
let nav_dir = match wparam.hiword() {
XBUTTON1 => NavigationDirection::Back,
XBUTTON2 => NavigationDirection::Forward,
_ => return LRESULT(1),
};
self.handle_mouse_up_msg(MouseButton::Navigate(nav_dir), lparam)
}
WM_XBUTTONUP => self.handle_xbutton_msg(wparam, lparam, Self::handle_mouse_up_msg),
WM_MOUSEWHEEL => self.handle_mouse_wheel_msg(wparam, lparam),
WM_MOUSEHWHEEL => self.handle_mouse_horizontal_wheel_msg(wparam, lparam),
WM_SYSKEYDOWN => self.handle_syskeydown_msg(wparam, lparam),
@ -632,6 +618,20 @@ impl WindowsWindowInner {
Some(1)
}
fn handle_xbutton_msg(
&self,
wparam: WPARAM,
lparam: LPARAM,
handler: impl Fn(&Self, MouseButton, LPARAM) -> Option<isize>,
) -> Option<isize> {
let nav_dir = match wparam.hiword() {
XBUTTON1 => NavigationDirection::Back,
XBUTTON2 => NavigationDirection::Forward,
_ => return Some(1),
};
handler(self, MouseButton::Navigate(nav_dir), lparam)
}
fn handle_mouse_wheel_msg(&self, wparam: WPARAM, lparam: LPARAM) -> Option<isize> {
let mut callbacks = self.callbacks.borrow_mut();
if let Some(callback) = callbacks.input.as_mut() {