wip

Author: prokopyl

src/lib.rs

@@ -24,6 +24,7 @@ pub use mouse_cursor::MouseCursor;
 pub use window::*;
 pub use window_open_options::*;
 
+#[allow(unused)]
 pub(crate) use tracing::warn;
 
 pub(crate) mod wrappers;

src/platform/macos/context.rs

@@ -2,7 +2,7 @@ use crate::platform::macos::cursor::Cursor;
 use crate::platform::macos::view::BaseviewView;
 use crate::platform::{PlatformHandle, WindowSharedState};
 use crate::wrappers::appkit::{View, ViewRef};
-use crate::{MouseCursor, WindowSize};
+use crate::*;
 use dispatch2::MainThreadBound;
 use dpi::Size;
 use objc2::rc::Weak;
@@ -50,27 +50,32 @@ impl WindowContext {
         view.isEqual(Some(&*first_responder))
     }
 
-    pub fn focus(&self) {
-        let Some(view) = self.view.load() else { return };
+    pub fn focus(&self) -> Result<()> {
+        let Some(view) = self.view.load() else { return Ok(()) };
         if let Some(window) = view.window() {
             window.makeFirstResponder(Some(&view));
         }
+
+        Ok(())
     }
 
-    pub fn resize(&self, size: Size) {
-        let Some(view) = self.view.load() else { return };
-        let Some(view) = view.inner_ref() else { return };
+    pub fn resize(&self, size: Size) -> Result<()> {
+        let Some(view) = self.view.load() else { return Ok(()) };
+        let Some(view) = view.inner_ref() else { return Ok(()) };
         if view.inner.state.closed.get() {
-            return;
+            return Ok(());
         }
 
         BaseviewView::resize(view, size);
+
+        Ok(())
     }
 
-    pub fn set_mouse_cursor(&self, cursor: MouseCursor) {
-        let Some(view) = self.view.load() else { return };
+    pub fn set_mouse_cursor(&self, cursor: MouseCursor) -> Result<()> {
+        let Some(view) = self.view.load() else { return Ok(()) };
         let native_cursor = Cursor::from(cursor);
         view.addCursorRect_cursor(view.bounds(), &native_cursor.load());
+        Ok(())
     }
 
     pub fn size(&self) -> WindowSize {

src/platform/macos/gl.rs

@@ -139,12 +139,14 @@ impl GlContext {
         Ok(GlContext { view, context, gl_bundle })
     }
 
-    pub unsafe fn make_current(&self) {
+    pub unsafe fn make_current(&self) -> Result<()> {
         self.context.makeCurrentContext();
+        Ok(())
     }
 
-    pub unsafe fn make_not_current(&self) {
+    pub unsafe fn make_not_current(&self) -> Result<()> {
         NSOpenGLContext::clearCurrentContext();
+        Ok(())
     }
 
     pub fn get_proc_address(&self, symbol: &CStr) -> *const c_void {
@@ -170,9 +172,10 @@ impl GlContext {
         self.gl_bundle.function_pointer_for_name(Some(&symbol_name))
     }
 
-    pub fn swap_buffers(&self) {
+    pub fn swap_buffers(&self) -> Result<()> {
         self.context.flushBuffer();
         self.view.setNeedsDisplay(true);
+        Ok(())
     }
 
     /// On macOS the `NSOpenGLView` needs to be resized separtely from our main view.