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

fix(macos): typo in the WebviewExtMacOS conditional compilation #568

Merged
merged 1 commit into from May 3, 2022
Merged

fix(macos): typo in the WebviewExtMacOS conditional compilation #568

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
5 changes: 5 additions & 0 deletions .changes/fix-WebviewExtMacOS.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---
"wry": patch
---

Fixes a typo in the `WebviewExtMacOS` conditional compilation.
4 changes: 2 additions & 2 deletions src/webview/mod.rs
View file
Open in desktop
Expand Up @@ -557,7 +557,7 @@ impl WebviewExtUnix for WebView {
}

/// Additional methods on `WebView` that are specific to macOS.
#[cfg(target_os = "macOS")]
#[cfg(target_os = "macos")]
pub trait WebviewExtMacOS {
/// Returns WKWebView handle
fn webview(&self) -> cocoa::base::id;
Expand All @@ -567,7 +567,7 @@ pub trait WebviewExtMacOS {
fn ns_window(&self) -> cocoa::base::id;
}

#[cfg(target_os = "macOS")]
#[cfg(target_os = "macos")]
impl WebviewExtMacOS for WebView {
fn webview(&self) -> cocoa::base::id {
self.webview.webview.clone()
Expand Down
6 changes: 3 additions & 3 deletions src/webview/wkwebview/mod.rs
View file
Open in desktop
Expand Up @@ -52,10 +52,10 @@ use crate::http::{
};

pub struct InnerWebView {
webview: id,
pub(crate) webview: id,
#[cfg(target_os = "macos")]
ns_window: id,
manager: id,
pub(crate) ns_window: id,
pub(crate) manager: id,
// Note that if following functions signatures are changed in the future,
// all fucntions pointer declarations in objc callbacks below all need to get updated.
ipc_handler_ptr: *mut (Box<dyn Fn(&Window, String)>, Rc<Window>),
Expand Down