From 40562eaf2575f5aa7eb9dfce19bfdb79a9042722 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Mon, 6 Mar 2023 00:20:41 +0800 Subject: [PATCH] remove usage of UnsafePointer (#594) --- apps/desktop/crates/macos/src-swift/webview.swift | 3 +-- apps/desktop/crates/macos/src-swift/window.swift | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/desktop/crates/macos/src-swift/webview.swift b/apps/desktop/crates/macos/src-swift/webview.swift index 02388d90e..f46c1a159 100644 --- a/apps/desktop/crates/macos/src-swift/webview.swift +++ b/apps/desktop/crates/macos/src-swift/webview.swift @@ -1,8 +1,7 @@ import WebKit @_cdecl("reload_webview") -public func reloadWebview(webviewPtr: UnsafePointer) -> () { - let webview = webviewPtr.pointee; +public func reloadWebview(webview: WKWebView) -> () { webview.window!.orderOut(webview); webview.reload(); webview.window!.makeKey(); diff --git a/apps/desktop/crates/macos/src-swift/window.swift b/apps/desktop/crates/macos/src-swift/window.swift index 6698cb413..9fcd4fe25 100644 --- a/apps/desktop/crates/macos/src-swift/window.swift +++ b/apps/desktop/crates/macos/src-swift/window.swift @@ -21,9 +21,7 @@ public func lockAppTheme(themeType: AppThemeType) { } @_cdecl("blur_window_background") -public func blurWindowBackground(windowPtr: UnsafePointer) { - let window = windowPtr.pointee; - +public func blurWindowBackground(window: NSWindow) { let windowContent = window.contentView!; let blurryView = NSVisualEffectView(); @@ -51,9 +49,7 @@ func setInvisibleToolbar(windowPtr: NSWindow, hasToolbar: Bool) { } @_cdecl("set_titlebar_style") -public func setTitlebarStyle(windowPtr: UnsafePointer, transparent: Bool, large: Bool) { - let window = windowPtr.pointee; - +public func setTitlebarStyle(window: NSWindow, transparent: Bool, large: Bool) { var styleMask = window.styleMask; if transparent && large {