wip

Author: prokopyl

examples/plugin_clack/src/gui.rs

@@ -1,6 +1,6 @@
 use crate::window_handler::OpenWindowExample;
 use crate::ExamplePluginMainThread;
-use baseview::dpi::PhysicalSize;
+use baseview::dpi::{LogicalSize, PhysicalSize, Size};
 use baseview::gl::GlConfig;
 use baseview::{WindowHandle, WindowOpenOptions, WindowSize};
 use clack_extensions::gui::{
@@ -39,8 +39,12 @@ impl PluginGuiImpl for ExamplePluginMainThread {
         gui.handle.close()
     }
 
-    fn set_scale(&mut self, _scale: f64) -> Result<(), PluginError> {
-        // Unsupported
+    fn set_scale(&mut self, scale: f64) -> Result<(), PluginError> {
+        let Some(gui) = &self.gui else {
+            return Err(PluginError::Message("set_scale called without a GUI active"));
+        };
+        gui.handle.suggest_scale_factor(scale)?;
+
         Ok(())
     }
 
@@ -49,19 +53,26 @@ impl PluginGuiImpl for ExamplePluginMainThread {
     }
 
     fn can_resize(&mut self) -> bool {
-        false // Non-resizeable windows not supported yet
+        true // Non-resizeable windows not supported yet
     }
 
     fn get_resize_hints(&mut self) -> Option<GuiResizeHints> {
         None // Not supported yet
     }
 
-    fn adjust_size(&mut self, _size: GuiSize) -> Option<GuiSize> {
-        None // Not supported yet
+    fn adjust_size(&mut self, size: GuiSize) -> Option<GuiSize> {
+        Some(size) // Not supported yet
     }
 
-    fn set_size(&mut self, _size: GuiSize) -> Result<(), PluginError> {
-        Ok(()) // Not supported yet
+    fn set_size(&mut self, size: GuiSize) -> Result<(), PluginError> {
+        let Some(gui) = &self.gui else {
+            return Err(PluginError::Message("set_size called without a GUI active"));
+        };
+
+        let size = gui_size_to_window_size(size);
+        gui.handle.resize(size)?;
+
+        Ok(())
     }
 
     #[allow(deprecated)]
@@ -111,3 +122,14 @@ fn window_size_to_gui_size(size: WindowSize) -> GuiSize {
         GuiSize { width: size.width, height: size.height }
     }
 }
+
+fn gui_size_to_window_size(size: GuiSize) -> Size {
+    #[cfg(target_os = "macos")]
+    {
+        Size::Logical(LogicalSize::new(size.width, size.height).cast())
+    }
+    #[cfg(not(target_os = "macos"))]
+    {
+        Size::Physical(PhysicalSize::new(size.width, size.height))
+    }
+}

src/platform/macos/window.rs

@@ -1,4 +1,4 @@
-use dpi::{LogicalSize, PhysicalSize};
+use dpi::{LogicalSize, Size};
 use objc2::rc::{autoreleasepool, Retained, Weak};
 use objc2::MainThreadMarker;
 use objc2_app_kit::{NSApplication, NSPasteboard, NSPasteboardTypeString, NSView, NSWindow};
@@ -95,6 +95,20 @@ impl WindowHandle {
     pub fn size(&self) -> WindowSize {
         WindowSize::from_logical(self.state.size.get(), self.state.scale_factor.get())
     }
+
+    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(()) };
+
+        BaseviewView::resize(view, size);
+
+        Ok(())
+    }
+
+    pub fn suggest_scale_factor(&self, _scale_factor: f64) -> Result<()> {
+        // This does not do anything on macOS: all coordinates are already logical
+        Ok(())
+    }
 }
 
 fn create_window_with_options(

src/window.rs

@@ -1,7 +1,7 @@
 use crate::handler::WindowHandlerBuilder;
 use crate::platform;
 use crate::*;
-use dpi::{LogicalSize, PhysicalSize, Pixel};
+use dpi::{LogicalSize, PhysicalSize, Pixel, Size};
 use std::marker::PhantomData;
 
 pub struct WindowHandle {
@@ -25,6 +25,16 @@ impl WindowHandle {
         self.window_handle.size()
     }
 
+    pub fn resize(&self, size: Size) -> Result<(), Error> {
+        self.window_handle.resize(size)?;
+        Ok(())
+    }
+
+    pub fn suggest_scale_factor(&self, scale_factor: f64) -> Result<(), Error> {
+        self.window_handle.suggest_scale_factor(scale_factor)?;
+        Ok(())
+    }
+
     /// Close the window
     pub fn close(self) {
         drop(self)