alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-18 07:51:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fixed win32 bug where resizing window wouldn't show resize cursors

Browse source
This commit is contained in:
Osspial 2016-05-07 21:00:50 -04:00
parent 524bc73039
commit 163563073f
2 changed files with 52 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/api/win32/callback.rs
View file

@ -24,7 +24,8 @@ thread_local!(pub static CONTEXT_STASH: RefCell<Option<ThreadLocalData>> = RefCe
pub struct ThreadLocalData { pub struct ThreadLocalData {
pub win: winapi::HWND, pub win: winapi::HWND,
pub sender: Sender<Event>, pub sender: Sender<Event>,
pub window_state: Arc<Mutex<WindowState>> pub window_state: Arc<Mutex<WindowState>>,
pub mouse_in_window: bool
} }
struct MinMaxInfo { struct MinMaxInfo {
@ -122,15 +123,40 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
winapi::WM_MOUSEMOVE => { winapi::WM_MOUSEMOVE => {
use events::Event::MouseMoved; use events::Event::MouseMoved;
CONTEXT_STASH.with(|context_stash| {
let mut context_stash = context_stash.borrow_mut();
if let Some(context_stash) = context_stash.as_mut() {
context_stash.mouse_in_window = true;
}
});
let x = winapi::GET_X_LPARAM(lparam) as i32; let x = winapi::GET_X_LPARAM(lparam) as i32;
let y = winapi::GET_Y_LPARAM(lparam) as i32; let y = winapi::GET_Y_LPARAM(lparam) as i32;
let mut mouse_track = winapi::TRACKMOUSEEVENT {
cbSize: mem::size_of::<winapi::TRACKMOUSEEVENT>() as winapi::DWORD,
dwFlags: winapi::TME_HOVER | winapi::TME_LEAVE,
hwndTrack: window,
dwHoverTime: winapi::HOVER_DEFAULT
};
user32::TrackMouseEvent(&mut mouse_track);
send_event(window, MouseMoved((x, y))); send_event(window, MouseMoved((x, y)));
0 0
}, },
winapi::WM_MOUSELEAVE => {
CONTEXT_STASH.with(|context_stash| {
let mut context_stash = context_stash.borrow_mut();
if let Some(context_stash) = context_stash.as_mut() {
context_stash.mouse_in_window = false;
}
});
0
},
winapi::WM_MOUSEWHEEL => { winapi::WM_MOUSEWHEEL => {
use events::Event::MouseWheel; use events::Event::MouseWheel;
use events::MouseScrollDelta::LineDelta; use events::MouseScrollDelta::LineDelta;
@ -264,31 +290,36 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
}, },
winapi::WM_SETCURSOR => { winapi::WM_SETCURSOR => {
CONTEXT_STASH.with(|context_stash| { let call_def_window_proc = CONTEXT_STASH.with(|context_stash| {
let cstash = context_stash.borrow(); let cstash = context_stash.borrow();
let cstash = cstash.as_ref(); let mut call_def_window_proc = false;
// there's a very bizarre borrow checker bug if let Some(cstash) = cstash.as_ref() {
// possibly related to rust-lang/rust/#23338
let _cursor_state = if let Some(cstash) = cstash {
if let Ok(window_state) = cstash.window_state.lock() { if let Ok(window_state) = cstash.window_state.lock() {
match window_state.cursor_state { if cstash.mouse_in_window {
CursorState::Normal => { match window_state.cursor_state {
user32::SetCursor(user32::LoadCursorW( CursorState::Normal => {
ptr::null_mut(), user32::SetCursor(user32::LoadCursorW(
window_state.cursor)); ptr::null_mut(),
}, window_state.cursor));
CursorState::Grab | CursorState::Hide => { },
user32::SetCursor(ptr::null_mut()); CursorState::Grab | CursorState::Hide => {
user32::SetCursor(ptr::null_mut());
}
} }
} else {
call_def_window_proc = true;
} }
} }
} else { }
return
};
// let &ThreadLocalData { ref cursor_state, .. } = stored; call_def_window_proc
}); });
0
if call_def_window_proc {
user32::DefWindowProcW(window, msg, wparam, lparam)
} else {
0
}
}, },
winapi::WM_DROPFILES => { winapi::WM_DROPFILES => {

3
src/api/win32/init.rs
View file

@ -169,7 +169,8 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes) -> Result<Window, Cre
let data = callback::ThreadLocalData { let data = callback::ThreadLocalData {
win: real_window.0, win: real_window.0,
sender: tx.take().unwrap(), sender: tx.take().unwrap(),
window_state: window_state.clone() window_state: window_state.clone(),
mouse_in_window: false
}; };
(*context_stash.borrow_mut()) = Some(data); (*context_stash.borrow_mut()) = Some(data);
}); });