pass &ComWrapper<Self> to WrapperView::request_resize

Author: micahrj

src/wrapper/vst3/inner.rs

@@ -647,7 +647,7 @@ impl<P: Vst3Plugin> MainThreadExecutor<Task<P>> for WrapperInner<P> {
             Task::RequestResize => match &*self.plug_view.read() {
                 Some(plug_view) => unsafe {
                     nih_debug_assert!(is_gui_thread);
-                    let success = plug_view.request_resize();
+                    let success = WrapperView::request_resize(plug_view);
                     nih_debug_assert!(success, "Failed requesting a window resize");
                 },
                 None => nih_debug_assert_failure!("Can't resize a closed editor"),

src/wrapper/vst3/view.rs

@@ -14,7 +14,7 @@ use vst3::Steinberg::{
     IPlugViewContentScaleSupportTrait, IPlugViewContentScaleSupport_::ScaleFactor, IPlugViewTrait,
     ViewRect,
 };
-use vst3::{Class, ComPtr, ComRef};
+use vst3::{Class, ComPtr, ComRef, ComWrapper};
 
 use super::inner::{Task, WrapperInner};
 use crate::plugin::vst3::Vst3Plugin;
@@ -125,9 +125,9 @@ impl<P: Vst3Plugin> WrapperView<P> {
     ///
     /// May cause memory corruption in Linux REAPER when called from outside of the `IRunLoop`.
     #[must_use]
-    pub unsafe fn request_resize(&self) -> bool {
+    pub unsafe fn request_resize(this: &ComWrapper<Self>) -> bool {
         // Don't do anything if the editor is not open, because that would be strange
-        if self
+        if this
             .editor_handle
             .try_read()
             .map(|e| e.is_none())
@@ -136,31 +136,26 @@ impl<P: Vst3Plugin> WrapperView<P> {
             return false;
         }
 
-        match &*self.plug_frame.read() {
+        match &*this.plug_frame.read() {
             Some(plug_frame) => {
-                let (unscaled_width, unscaled_height) = self.editor.lock().size();
-                let scaling_factor = self.scaling_factor.load(Ordering::Relaxed);
+                let (unscaled_width, unscaled_height) = this.editor.lock().size();
+                let scaling_factor = this.scaling_factor.load(Ordering::Relaxed);
                 let mut size = ViewRect {
                     left: 0,
                     top: 0,
                     right: (unscaled_width as f32 * scaling_factor).round() as i32,
                     bottom: (unscaled_height as f32 * scaling_factor).round() as i32,
                 };
 
-                // // The argument types are a bit wonky here because you can't construct a
-                // // `SharedVstPtr`. This _should_ work however.
-                // let plug_view: SharedVstPtr<dyn IPlugView> =
-                //     mem::transmute(&self.__iplugviewvptr as *const *const _);
-                // let result = plug_frame.resize_view(plug_view, &mut size);
+                let plug_view = this.to_com_ptr::<IPlugView>().unwrap();
+                let result = plug_frame.resizeView(plug_view.into_raw(), &mut size);
 
-                // debug_assert_eq!(
-                //     result, kResultOk,
-                //     "The host denied the resize, we currently don't handle this for VST3 plugins"
-                // );
+                debug_assert_eq!(
+                    result, kResultOk,
+                    "The host denied the resize, we currently don't handle this for VST3 plugins"
+                );
 
-                // result == kResultOk
-
-                true
+                result == kResultOk
             }
             None => false,
         }