Unify scaling factor names
This commit is contained in:
@@ -12,7 +12,7 @@ use crate::window::EditorWindow;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct EditorState {
|
||||
/// The window's size in logical pixels before applying `scale_factor`.
|
||||
/// The window's size in logical pixels before applying `scaling_factor`.
|
||||
#[serde(with = "nih_plug::params::persist::serialize_atomic_cell")]
|
||||
pub size: AtomicCell<(u32, u32)>,
|
||||
/// Whether the editor's window is currently open.
|
||||
|
||||
@@ -41,13 +41,13 @@ pub struct PluginGui {
|
||||
fn create_canvas(
|
||||
context: &GlContext,
|
||||
params: &PluginParams,
|
||||
scaling_factor: &AtomicF32,
|
||||
scaling_factor: f32,
|
||||
) -> Result<Canvas<OpenGl>, &'static str> {
|
||||
let renderer = unsafe { OpenGl::new_from_function(|s| context.get_proc_address(s)) }
|
||||
.map_err(|_| "Failed to create OpenGL renderer")?;
|
||||
let mut canvas = Canvas::new(renderer).map_err(|_| "Failed to create femtovg canvas")?;
|
||||
let (width, height) = params.editor_state.size();
|
||||
canvas.set_size(width, height, scaling_factor.load(Ordering::Relaxed));
|
||||
canvas.set_size(width, height, scaling_factor);
|
||||
Ok(canvas)
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ impl PluginGui {
|
||||
unsafe {
|
||||
context.make_current();
|
||||
}
|
||||
if let Ok(mut canvas) = create_canvas(context, ¶ms, &scaling_factor) {
|
||||
if let Ok(mut canvas) = create_canvas(context, ¶ms, scaling_factor.load(Ordering::Acquire)) {
|
||||
this.font = canvas
|
||||
.add_font_mem(DROID_SANS_FONT)
|
||||
.map_err(|err| format!("{:?}", err));
|
||||
@@ -130,7 +130,7 @@ impl WindowHandler for PluginGui {
|
||||
if self.canvas.is_none() {
|
||||
return;
|
||||
}
|
||||
let scaling_factor = self.scaling_factor.load(Ordering::Relaxed);
|
||||
let scaling_factor = self.scaling_factor.load(Ordering::Acquire);
|
||||
let canvas = self.canvas.as_mut().unwrap();
|
||||
|
||||
if !self.dirty {
|
||||
@@ -223,12 +223,12 @@ impl WindowHandler for PluginGui {
|
||||
if let Some(canvas) = self.canvas.as_mut() {
|
||||
let canvas_width = canvas.width();
|
||||
let editor_width = self.params.editor_state.size.load().0;
|
||||
let new_scale_factor = canvas_width as f32 / editor_width as f32;
|
||||
let new_scaling_factor = canvas_width as f32 / editor_width as f32;
|
||||
|
||||
self.scaling_factor
|
||||
.store(new_scale_factor, Ordering::Release);
|
||||
.store(new_scaling_factor, Ordering::Release);
|
||||
|
||||
canvas.set_size(phys_size.width, phys_size.height, new_scale_factor);
|
||||
canvas.set_size(phys_size.width, phys_size.height, new_scaling_factor);
|
||||
}
|
||||
self.dirty = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user