Skip to content

Implement WindowBuilder::set_min_size for windows. #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xStrom merged 2 commits into from
Mar 21, 2020
Merged

Implement WindowBuilder::set_min_size for windows. #727

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c6374e
Implement WindowBuilder::set_min_size for windows.
teddemunnik Mar 21, 2020
c55baea
Remove unneccesay kurbo module name from type
teddemunnik Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion druid-shell/src/platform/windows/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ struct WndState {
render_target: Option<DeviceContext>,
dcomp_state: Option<DCompState>,
dpi: f32,
min_size: Option<kurbo::Size>,
/// The `KeyCode` of the last `WM_KEYDOWN` event. We stash this so we can
/// include it when handling `WM_CHAR` events.
stashed_key_code: KeyCode,
Expand Down Expand Up @@ -703,6 +704,21 @@ impl WndProc for MyWndProc {
}
Some(0)
}
WM_GETMINMAXINFO => {
let min_max_info = unsafe { &mut *(lparam as *mut MINMAXINFO) };
if let Ok(s) = self.state.try_borrow() {
let s = s.as_ref().unwrap();
if let Some(min_size) = s.min_size {
min_max_info.ptMinTrackSize.x =
(min_size.width * (f64::from(s.dpi) / 96.0)) as i32;
min_max_info.ptMinTrackSize.y =
(min_size.height * (f64::from(s.dpi) / 96.0)) as i32;
}
} else {
self.log_dropped_msg(hwnd, msg, wparam, lparam);
}
Some(0)
}
XI_RUN_IDLE => {
if let Ok(mut s) = self.state.try_borrow_mut() {
let s = s.as_mut().unwrap();
Expand Down Expand Up @@ -756,7 +772,6 @@ impl WindowBuilder {
}

pub fn set_min_size(&mut self, size: Size) {
// TODO: Use this in `self.build`
self.min_size = Some(size);
}

Expand Down Expand Up @@ -822,6 +837,7 @@ impl WindowBuilder {
render_target: None,
dcomp_state: None,
dpi,
min_size: self.min_size,
stashed_key_code: KeyCode::Unknown(0),
stashed_char: None,
captured_mouse_buttons: 0,
Expand Down