From ef42174a6a67da3248bdf781aee37a76b35ed156 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sun, 5 Nov 2023 23:10:12 +0100 Subject: [PATCH] Update Vizia utils for upstream changes --- nih_plug_vizia/src/widgets/util.rs | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/nih_plug_vizia/src/widgets/util.rs b/nih_plug_vizia/src/widgets/util.rs index 2172e535..6e8365d5 100644 --- a/nih_plug_vizia/src/widgets/util.rs +++ b/nih_plug_vizia/src/widgets/util.rs @@ -37,10 +37,7 @@ impl ModifiersExt for Modifiers { /// Remap a `[0, 1]` value to an x-coordinate within the current entity's bounding box. The value /// will be clamped to `[0, 1]` if it isn't already in that range. This ignores the border width. pub fn remap_current_entity_x_t(cx: &EventContext, t: f32) -> f32 { - let border_width = match cx.style.border_width.get(cx.current()) { - Some(Units::Pixels(x)) => *x, - _ => 0.0, - }; + let border_width = cx.border_width(); let x_pos = cx.cache.get_posx(cx.current()) + border_width; let width = cx.cache.get_width(cx.current()) - (border_width * 2.0); x_pos + (width * t.clamp(0.0, 1.0)) @@ -54,10 +51,7 @@ pub fn remap_current_entity_x_t(cx: &EventContext, t: f32) -> f32 { /// As y-coordinates increase from top to bottom, this value is likely the inverse of what you want. /// 0.0 is the bottom of the enitty and 1.0 corresponds to the top of the entity. pub fn remap_current_entity_y_t(cx: &EventContext, t: f32) -> f32 { - let border_width = match cx.style.border_width.get(cx.current()) { - Some(Units::Pixels(x)) => *x, - _ => 0.0, - }; + let border_width = cx.border_width(); let y_pos = cx.cache.get_posy(cx.current()) + border_width; let height = cx.cache.get_height(cx.current()) - (border_width * 2.0); y_pos + (height * t.clamp(0.0, 1.0)) @@ -66,10 +60,7 @@ pub fn remap_current_entity_y_t(cx: &EventContext, t: f32) -> f32 { /// Remap an x-coordinate to a `[0, 1]` value within the current entity's bounding box. The value /// will be clamped to `[0, 1]` if it isn't already in that range. This ignores the border width. pub fn remap_current_entity_x_coordinate(cx: &EventContext, x_coord: f32) -> f32 { - let border_width = match cx.style.border_width.get(cx.current()) { - Some(Units::Pixels(x)) => *x, - _ => 0.0, - }; + let border_width = cx.border_width(); let x_pos = cx.cache.get_posx(cx.current()) + border_width; let width = cx.cache.get_width(cx.current()) - (border_width * 2.0); ((x_coord - x_pos) / width).clamp(0.0, 1.0) @@ -83,10 +74,7 @@ pub fn remap_current_entity_x_coordinate(cx: &EventContext, x_coord: f32) -> f32 /// As y-coordinates increase from top to bottom, this value is likely the inverse of what you want. /// 0.0 is the bottom of the enitty and 1.0 corresponds to the top of the entity. pub fn remap_current_entity_y_coordinate(cx: &EventContext, y_coord: f32) -> f32 { - let border_width = match cx.style.border_width.get(cx.current()) { - Some(Units::Pixels(x)) => *x, - _ => 0.0, - }; + let border_width = cx.border_width(); let y_pos = cx.cache.get_posy(cx.current()) + border_width; let height = cx.cache.get_height(cx.current()) - (border_width * 2.0); ((y_coord - y_pos) / height).clamp(0.0, 1.0)