leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

child window created using a winapi::HWND instead of a WindowProxy

Browse source
This commit is contained in:
k-brac 2016-11-29 13:02:42 +01:00
parent 2b25bf1480
commit 3e2154a922
5 changed files with 54 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/os/windows.rs
View file

@ -3,9 +3,7 @@
use libc;
use Window;
use WindowBuilder;
use window;
use winapi;
use platform;
/// Additional methods on `Window` that are specific to Windows.
pub trait WindowExt {
@ -26,22 +24,14 @@ impl WindowExt for Window {
/// Additional methods on `WindowBuilder` that are specific to Windows.
pub trait WindowBuilderExt {
fn with_parent_window(self, parent: window::WindowProxy) -> WindowBuilder;
fn with_parent_window(self, parent: winapi::HWND) -> WindowBuilder;
}
impl WindowBuilderExt for WindowBuilder {
/// Sets a parent to the window to be created
#[inline]
fn with_parent_window(mut self, parent: window::WindowProxy) -> WindowBuilder {
fn with_parent_window(mut self, parent: winapi::HWND) -> WindowBuilder {
self.platform_specific.parent = Some(parent);
self
}
}
impl WindowBuilderExt {
/// Creates a new WindowProxy from a winapi::HWND
#[inline]
pub fn create_window_proxy_from_handle(handle: winapi::HWND) -> window::WindowProxy {
window::WindowProxy::create_proxy(platform::WindowProxy{hwnd: handle})
}
}

2
src/platform/windows/init.rs
View file

@ -133,7 +133,7 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pl_attribs: PlatformS
style | winapi::WS_CLIPSIBLINGS | winapi::WS_CLIPCHILDREN,
x.unwrap_or(winapi::CW_USEDEFAULT), y.unwrap_or(winapi::CW_USEDEFAULT),
width.unwrap_or(winapi::CW_USEDEFAULT), height.unwrap_or(winapi::CW_USEDEFAULT),
pl_attribs.parent.map_or(ptr::null_mut(), |v| v.get_proxy_data().hwnd),
pl_attribs.parent.unwrap_or(ptr::null_mut()),
ptr::null_mut(), kernel32::GetModuleHandleW(ptr::null()),
ptr::null_mut());

8
src/platform/windows/mod.rs
View file

@ -15,12 +15,14 @@ use CursorState;
use WindowAttributes;
use window;
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes {
pub parent: Option<window::WindowProxy>,
pub parent: Option<winapi::HWND>,
}
unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;

13
src/window.rs
View file

@ -372,19 +372,8 @@ impl WindowProxy {
pub fn wakeup_event_loop(&self) {
self.proxy.wakeup_event_loop();
}
/// Returns the platform specific proxy data
#[inline]
pub fn get_proxy_data(&self) -> &platform::WindowProxy {
&self.proxy
}
/// Create a WindowProxy by directly setting its platform specific data
#[inline]
pub fn create_proxy(data: platform::WindowProxy) -> WindowProxy {
WindowProxy {proxy: data}
}
}
/// An iterator for the `poll_events` function.
pub struct PollEventsIterator<'a>(platform::PollEventsIterator<'a>);