Skip to content
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

Jump to bottom

API review: move {window,display}_handle_06_rc() into WindowAdapterIn… #5560

Merged
merged 1 commit into from
Jul 5, 2024
Merged

API review: move {window,display}_handle_06_rc() into WindowAdapterIn… #5560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 20 additions & 20 deletions internal/backends/winit/winitwindowadapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,26 +874,6 @@ impl WindowAdapter for WinitWindowAdapter {
fn internal(&self, _: corelib::InternalToken) -> Option<&dyn WindowAdapterInternal> {
Some(self)
}

#[cfg(feature = "raw-window-handle-06")]
fn window_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle::HasWindowHandle>, raw_window_handle::HandleError> {
self.winit_window_or_none
.borrow()
.as_window()
.map_or(Err(raw_window_handle::HandleError::Unavailable), |window| Ok(window))
}

#[cfg(feature = "raw-window-handle-06")]
fn display_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle::HasDisplayHandle>, raw_window_handle::HandleError> {
self.winit_window_or_none
.borrow()
.as_window()
.map_or(Err(raw_window_handle::HandleError::Unavailable), |window| Ok(window))
}
}

impl WindowAdapterInternal for WinitWindowAdapter {
Expand Down Expand Up @@ -1027,6 +1007,26 @@ impl WindowAdapterInternal for WinitWindowAdapter {
a.unregister_item_tree(component);
}
}

#[cfg(feature = "raw-window-handle-06")]
fn window_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle::HasWindowHandle>, raw_window_handle::HandleError> {
self.winit_window_or_none
.borrow()
.as_window()
.map_or(Err(raw_window_handle::HandleError::Unavailable), |window| Ok(window))
}

#[cfg(feature = "raw-window-handle-06")]
fn display_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle::HasDisplayHandle>, raw_window_handle::HandleError> {
self.winit_window_or_none
.borrow()
.as_window()
.map_or(Err(raw_window_handle::HandleError::Unavailable), |window| Ok(window))
}
}

impl Drop for WinitWindowAdapter {
Expand Down
4 changes: 3 additions & 1 deletion internal/core/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,9 @@ impl Window {
pub fn window_handle(&self) -> WindowHandle {
let adapter = self.0.window_adapter();
if let Some((window_handle_provider, display_handle_provider)) =
adapter.window_handle_06_rc().ok().zip(adapter.display_handle_06_rc().ok())
adapter.internal(crate::InternalToken).and_then(|internal| {
internal.window_handle_06_rc().ok().zip(internal.display_handle_06_rc().ok())
})
{
WindowHandle {
inner: WindowHandleInner::HandleByRcRWH {
Expand Down
36 changes: 18 additions & 18 deletions internal/core/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,24 +153,6 @@ pub trait WindowAdapter {
) -> Result<raw_window_handle_06::DisplayHandle<'_>, raw_window_handle_06::HandleError> {
Err(raw_window_handle_06::HandleError::NotSupported)
}

/// Re-implement this to support exposing raw window handles (version 0.6).
#[cfg(feature = "raw-window-handle-06")]
fn window_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle_06::HasWindowHandle>, raw_window_handle_06::HandleError>
{
Err(raw_window_handle_06::HandleError::NotSupported)
}

/// Re-implement this to support exposing raw display handles (version 0.6).
#[cfg(feature = "raw-window-handle-06")]
fn display_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle_06::HasDisplayHandle>, raw_window_handle_06::HandleError>
{
Err(raw_window_handle_06::HandleError::NotSupported)
}
}

/// Implementation details behind [`WindowAdapter`], but since this
Expand Down Expand Up @@ -222,6 +204,24 @@ pub trait WindowAdapterInternal {
fn color_scheme(&self) -> ColorScheme {
ColorScheme::Unknown
}

/// Re-implement this to support exposing raw window handles (version 0.6).
#[cfg(feature = "raw-window-handle-06")]
fn window_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle_06::HasWindowHandle>, raw_window_handle_06::HandleError>
{
Err(raw_window_handle_06::HandleError::NotSupported)
}

/// Re-implement this to support exposing raw display handles (version 0.6).
#[cfg(feature = "raw-window-handle-06")]
fn display_handle_06_rc(
&self,
) -> Result<Rc<dyn raw_window_handle_06::HasDisplayHandle>, raw_window_handle_06::HandleError>
{
Err(raw_window_handle_06::HandleError::NotSupported)
}
}

/// This is the parameter from [`WindowAdapterInternal::input_method_request()`] which lets the editable text input field
Expand Down