sergey/nih-plug
1
0
Fork 0
mirror of https://github.com/robbert-vdh/nih-plug.git synced 2026-07-01 02:36:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for new vizia resize patch

Browse Source 
This version uses a property on the context instead of events. This gets
rid of all of the problems and complexity of the previous
implementation.
This commit is contained in:
Robbert van der Helm
2022-03-29 00:02:11 +02:00
parent 4195105e43
commit 7b9eff456c
4 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nih_plug_vizia/src/widgets.rs
View File

@@ -99,44 +99,32 @@ impl Model for WindowModel {
fn event(&mut self, cx: &mut vizia::Context, event: &mut vizia::Event) {
if let Some(window_event) = event.message.downcast() {
match *window_event {
WindowEvent::ResizeWindow(logical_width, logical_height) => {
let logical_size =
(logical_width.round() as u32, logical_height.round() as u32);
let old_size @ (old_logical_width, old_logical_height) =
// This gets fired whenever the inner window gets resized
WindowEvent::WindowResize => {
let logical_size = (cx.window_size.width, cx.window_size.height);
let old_logical_size @ (old_logical_width, old_logical_height) =
self.vizia_state.size.load();
let scale_factor = cx.user_scale_factor;
let old_user_scale_factor = self.vizia_state.scale_factor.load();
// Don't do anything if the current size already matches the new size, this
// could otherwise also cause a feedback loop on resize failure
if logical_size == old_size {
if logical_size == old_logical_size && scale_factor == old_user_scale_factor {
return;
}
// Our embedded baseview window will have already been resized. If the host does
// not accept our new size, then we'll try to undo that
self.vizia_state.size.store(logical_size);
self.vizia_state.scale_factor.store(scale_factor);
if !self.context.request_resize() {
self.vizia_state.size.store(old_size);
cx.emit(WindowEvent::ResizeWindow(
old_logical_width as f32,
old_logical_height as f32,
));
}
}
WindowEvent::SetScale(user_scale_factor) => {
let old_user_scale_factor = self.vizia_state.scale_factor.load();
// Don't do anything if the current scale already matches the new scale
if user_scale_factor == old_user_scale_factor {
return;
}
// This works the same as the `ResizeWindow` handler. The actual window size
// reported to the host gets calculated from a combination of the window's
// logical size (before user scaling) and the user scale factor.
self.vizia_state.scale_factor.store(user_scale_factor);
if !self.context.request_resize() {
self.vizia_state.size.store(old_logical_size);
self.vizia_state.scale_factor.store(old_user_scale_factor);
cx.emit(WindowEvent::SetScale(old_user_scale_factor));
// This will cause the window's size to be reverted on the next event loop
cx.window_size.width = old_logical_width;
cx.window_size.height = old_logical_height;
cx.user_scale_factor = old_user_scale_factor;
}
}

13
nih_plug_vizia/src/widgets/resize_handle.rs
View File

@@ -3,8 +3,6 @@
use femtovg::{Paint, Path};
use vizia::*;
use super::WindowModel;
/// A resize handle placed at the bottom right of the window that lets you resize the window.
pub struct ResizeHandle {
/// Will be set to `true` if we're dragging the parameter. Resetting the parameter or entering a
@@ -44,9 +42,8 @@ impl View for ResizeHandle {
cx.capture();
cx.current.set_active(cx, true);
let vizia_state = WindowModel::vizia_state.get(cx);
self.drag_active = true;
self.start_scale_factor = vizia_state.user_scale_factor();
self.start_scale_factor = cx.user_scale_factor;
self.start_physical_coordinates = (
cx.mouse.cursorx * cx.style.dpi_factor as f32,
cx.mouse.cursory * cx.style.dpi_factor as f32,
@@ -63,8 +60,6 @@ impl View for ResizeHandle {
WindowEvent::MouseMove(x, y) => {
// TODO: Filter the hover color and dragging to the actual triangle
if self.drag_active {
let vizia_state = WindowModel::vizia_state.get(cx);
// We need to convert our measurements into physical pixels relative to the
// initial drag to be able to keep a consistent ratio. This 'relative to the
// start' bit is important because otherwise we would be comparing the
@@ -82,9 +77,9 @@ impl View for ResizeHandle {
as f64)
// Prevent approaching zero here because uh
.max(0.25);
if new_scale_factor != vizia_state.user_scale_factor() {
cx.emit(WindowEvent::SetScale(new_scale_factor));
}
// If this is different then the window will automatically be resized at the end of the frame
cx.user_scale_factor = new_scale_factor;
}
}
_ => {}