alex/baseview
1
0
Fork 0
Code Activity

Merge pull request #11 from MirkoCovizzi/master

Browse source 
Windows: add basic parent window support
This commit is contained in:
Mirko Covizzi 2020-06-04 23:52:40 +02:00 committed by GitHub
parent 9d4d82f9f7 756b182250
commit 0feae21459
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/win/window.rs
View file

@ -16,9 +16,11 @@ use self::winapi::um::wingdi::{
use self::winapi::um::winuser::{
CreateWindowExA, DefWindowProcA, DispatchMessageA, GetDC, PeekMessageA, PostQuitMessage,
RegisterClassA, TranslateMessage, CS_HREDRAW, CS_OWNDC, CS_VREDRAW, CW_USEDEFAULT, MSG,
PM_REMOVE, WM_DESTROY, WM_QUIT, WNDCLASSA, WS_OVERLAPPEDWINDOW, WS_VISIBLE,
PM_REMOVE, WM_DESTROY, WM_QUIT, WNDCLASSA, WS_CAPTION, WS_CHILD, WS_CLIPSIBLINGS,
WS_MAXIMIZEBOX, WS_MINIMIZEBOX, WS_POPUPWINDOW, WS_SIZEBOX, WS_VISIBLE,
};
use crate::Parent::WithParent;
use crate::WindowOpenOptions;
pub struct Window;
@ -60,18 +62,32 @@ impl Window {
};
RegisterClassA(&wnd_class);
let mut flags = WS_POPUPWINDOW
| WS_CAPTION
| WS_VISIBLE
| WS_SIZEBOX
| WS_MINIMIZEBOX
| WS_MAXIMIZEBOX
| WS_CLIPSIBLINGS;
let mut parent = null_mut();
if let WithParent(p) = options.parent {
parent = p;
flags = WS_CHILD | WS_VISIBLE;
}
let hwnd = CreateWindowExA(
0,
class_name.as_ptr() as *const i8,
(options.title.to_owned() + "\0").as_ptr() as *const i8,
// todo: fine for now, will have to change with a parent
WS_OVERLAPPEDWINDOW | WS_VISIBLE,
flags,
CW_USEDEFAULT,
CW_USEDEFAULT,
// todo: check if usize fits into i32
options.width as i32,
options.height as i32,
null_mut(),
parent as *mut _,
null_mut(),
null_mut(),
null_mut(),
@ -116,6 +132,7 @@ impl Window {
});
// todo: decide what to do with the message pump
if parent.is_null() {
loop {
if !handle_msg(null_mut()) {
break;
@ -127,6 +144,7 @@ impl Window {
SwapBuffers(hdc);
}
}
}
Window
}