From d6d2979251fcafb651809358592f46918f5f3ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sun, 1 Nov 2026 00:18:43 +0100 Subject: [PATCH] Use knobs from maolan-widgets --- src/chorus/gui.rs | 12 +-- src/common/ui.rs | 38 ---------- src/compressor/gui.rs | 9 ++- src/deesser/gui.rs | 12 +-- src/delay/gui.rs | 17 +++-- src/eq/gui.rs | 14 ++-- src/flanger/gui.rs | 9 ++- src/formant/gui.rs | 12 +-- src/kick/gui/mod.rs | 11 +-- src/limiter/gui.rs | 9 ++- src/modeler/gui.rs | 12 +-- src/phaser/gui.rs | 12 +-- src/reverb/gui.rs | 9 ++- src/sampler/gui.rs | 166 +++++++++++++++++++----------------------- src/saturator/gui.rs | 12 +-- src/stereo/gui.rs | 12 +-- src/synth/gui.rs | 4 +- src/vocoder/gui.rs | 12 +-- src/wah/gui.rs | 12 +-- 19 files changed, 177 insertions(+), 217 deletions(-) diff --git a/src/chorus/gui.rs b/src/chorus/gui.rs index 67f59e0..40bbfda 100644 --- a/src/chorus/gui.rs +++ b/src/chorus/gui.rs @@ -21,15 +21,14 @@ use maolan_baseview::iced::{ use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ chorus::{ params::{PARAMS, ParamId}, plugin::SharedState, }, - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, }; pub const EDITOR_WIDTH: u32 = 420; @@ -178,14 +177,15 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag ParamId::Voices => format!("{value:.0}"), }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: def.step as f32, value_text, + assigned: false, }, move |v| Message::ParamChanged(id, v), Message::ParamReleased(id), diff --git a/src/common/ui.rs b/src/common/ui.rs index 3a01df5..102f6bd 100644 --- a/src/common/ui.rs +++ b/src/common/ui.rs @@ -2,7 +2,6 @@ use maolan_baseview::iced::{ Alignment, Background, Border, Color, Element, Length, Theme, widget::{column, container, text}, }; -use maolan_widgets::arch_slider::arch_slider; use maolan_widgets::meters; use maolan_widgets::slider::Slider as VerticalSliderWidget; use maolan_widgets::ticks; @@ -13,43 +12,6 @@ const SIDE_FADER_WIDTH: f32 = 50.0; const SIDE_TICKS_WIDTH: f32 = 25.0; const SIDE_COLUMN_WIDTH: f32 = SIDE_FADER_WIDTH + SIDE_TICKS_WIDTH; -pub struct SmallKnob { - pub label: String, - pub value: f32, - pub range: std::ops::RangeInclusive, - pub default: f32, - pub step: f32, - pub value_text: String, -} - -pub fn small_knob( - knob: SmallKnob, - on_change: impl Fn(f32) -> Message + 'static, - on_release: Message, -) -> Element<'static, Message> { - let min = *knob.range.start(); - let max = *knob.range.end(); - let slider = arch_slider(knob.range, knob.value.clamp(min, max), on_change) - .step(knob.step) - .double_click_reset(knob.default) - .on_release(on_release) - .fill_from_start() - .width(Length::Fixed(41.0)) - .height(Length::Fixed(41.0)); - - container( - column![ - text(knob.label).size(11), - slider, - text(knob.value_text).size(10) - ] - .spacing(2) - .align_x(Alignment::Center), - ) - .width(Length::Fixed(SIDE_FADER_WIDTH)) - .into() -} - pub struct VerticalSlider { pub value: f32, pub range: std::ops::RangeInclusive, diff --git a/src/compressor/gui.rs b/src/compressor/gui.rs index 9cf1bcb..65adc62 100644 --- a/src/compressor/gui.rs +++ b/src/compressor/gui.rs @@ -5,6 +5,8 @@ use std::{ time::Duration, }; +use maolan_widgets::knob::Knob; + use crate::common::{ bus, preset::{self, PresetProvider, PresetUi}, @@ -12,7 +14,7 @@ use crate::common::{ DEFAULT_SPECTRUM_BINS, SPECTRUM_FLOOR_DB, SpectralAnalyzerWidget, SpectrumMarker, SpectrumThresholdCurve, display_range_bounds, }, - ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vertical_ticks, vu_meter}, + ui::{VerticalSlider, vertical_slider, vertical_ticks, vu_meter}, }; use maolan_baseview::iced::{ @@ -1249,14 +1251,15 @@ fn knob_with_range( format!("{value:.1} {units}") }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: min..=max, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v.clamp(min, max)), Message::ReleaseParam(id), diff --git a/src/deesser/gui.rs b/src/deesser/gui.rs index 9ee0d38..f4d24ef 100644 --- a/src/deesser/gui.rs +++ b/src/deesser/gui.rs @@ -20,11 +20,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, deesser::{ params::{PARAMS, ParamId}, plugin::SharedState, @@ -200,14 +199,15 @@ fn knob( format!("{value:.1} {units}") }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/delay/gui.rs b/src/delay/gui.rs index 482afc2..519910c 100644 --- a/src/delay/gui.rs +++ b/src/delay/gui.rs @@ -20,11 +20,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, delay::{ params::{NOTE_DIVISIONS, PARAMS, ParamId}, plugin::SharedState, @@ -204,14 +203,15 @@ fn view(state: &State) -> Element<'_, Message> { let def = &PARAMS[id.as_index()]; let value_text = format!("{value:.2}"); - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: 0.01, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), @@ -237,14 +237,15 @@ fn view(state: &State) -> Element<'_, Message> { format!("{value:.0} ms") }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: def.step as f32, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/eq/gui.rs b/src/eq/gui.rs index e923f38..e10b6a5 100644 --- a/src/eq/gui.rs +++ b/src/eq/gui.rs @@ -1,8 +1,10 @@ +use maolan_widgets::knob::Knob; + use crate::common::{ bus, preset::{self, PresetProvider, PresetUi}, spectrum::{db_to_y, display_range_bounds, freq_to_x, x_to_freq, y_to_db}, - ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vertical_ticks, vu_meter}, + ui::{VerticalSlider, vertical_slider, vertical_ticks, vu_meter}, }; use crate::eq::dsp::{self, Biquad}; use crate::eq::params::{PARAMS, ParamId, ParamIdExt}; @@ -2725,14 +2727,15 @@ fn knob( format!("{value:.1} {units}") }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label, value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), @@ -3195,14 +3198,15 @@ fn freq_knob(id: ParamId, value_hz: f32) -> Element<'static, Message> { let value_norm = freq_to_norm(value_hz); let default_norm = freq_to_norm(def.default as f32); - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: "Freq".to_string(), value: value_norm, range: 0.0..=1.0, default: default_norm, step: 0.001, value_text: String::new(), + assigned: false, }, move |n| Message::SetParam(id, norm_to_freq(n)), Message::ReleaseParam(id), diff --git a/src/flanger/gui.rs b/src/flanger/gui.rs index ba8b514..7455dbc 100644 --- a/src/flanger/gui.rs +++ b/src/flanger/gui.rs @@ -24,10 +24,12 @@ use maolan_baseview::iced::{ use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ common::{ preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vu_meter}, + ui::{VerticalSlider, vertical_slider, vu_meter}, }, flanger::{ params::{FRACTION_NAMES, LFO_TYPE_NAMES, LFO2_TYPE_NAMES, PARAMS, PERIOD_NAMES, ParamId}, @@ -182,8 +184,8 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag _ => format!("{value:.2}"), }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, @@ -194,6 +196,7 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag 0.01 }, value_text, + assigned: false, }, move |v| Message::ParamChanged(id, v), Message::ParamReleased(id), diff --git a/src/formant/gui.rs b/src/formant/gui.rs index 47d619c..88251ec 100644 --- a/src/formant/gui.rs +++ b/src/formant/gui.rs @@ -21,11 +21,10 @@ use maolan_baseview::iced::{ use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, formant::{ params::{PARAMS, ParamId}, plugin::SharedState, @@ -177,14 +176,15 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag ParamId::OutputGain => format!("{value:.1} dB"), }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: def.step as f32, value_text, + assigned: false, }, move |v| Message::ParamChanged(id, v), Message::ParamReleased(id), diff --git a/src/kick/gui/mod.rs b/src/kick/gui/mod.rs index 6d770d3..dc74ffa 100644 --- a/src/kick/gui/mod.rs +++ b/src/kick/gui/mod.rs @@ -21,10 +21,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11; use maolan_widgets::arch_slider::arch_slider; use maolan_widgets::meters::meters; +use maolan_widgets::knob::Knob; + use crate::common::preset::{self, PresetProvider, PresetUi}; -use crate::common::ui::{ - FADER_MAX_DB, FADER_MIN_DB, SmallKnob, VerticalSlider, small_knob, vertical_slider, -}; +use crate::common::ui::{FADER_MAX_DB, FADER_MIN_DB, VerticalSlider, vertical_slider}; #[cfg(any( target_os = "windows", target_os = "macos", @@ -1446,14 +1446,15 @@ fn knob( let def = param_type_def(id.param_type()); let value_text = knob_value_text(value, units); - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/limiter/gui.rs b/src/limiter/gui.rs index f2041b4..be87ba8 100644 --- a/src/limiter/gui.rs +++ b/src/limiter/gui.rs @@ -32,10 +32,12 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ common::{ preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vertical_ticks, vu_meter}, + ui::{VerticalSlider, vertical_slider, vertical_ticks, vu_meter}, }, limiter::{ params::{PARAMS, ParamId}, @@ -731,14 +733,15 @@ fn knob( } }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/modeler/gui.rs b/src/modeler/gui.rs index a2ae58b..a70168d 100644 --- a/src/modeler/gui.rs +++ b/src/modeler/gui.rs @@ -26,11 +26,10 @@ use maolan_widgets::arch_slider::arch_slider; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, modeler::{ params::{PARAMS, ParamId}, plugin::SharedState, @@ -1722,14 +1721,15 @@ fn knob( format!("{value:.1} {units}") }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/phaser/gui.rs b/src/phaser/gui.rs index 0f39e1c..0423928 100644 --- a/src/phaser/gui.rs +++ b/src/phaser/gui.rs @@ -21,11 +21,10 @@ use maolan_baseview::iced::{ use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, phaser::{ params::{PARAMS, ParamId}, plugin::SharedState, @@ -223,14 +222,15 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag ParamId::Stages => format!("{value:.0}"), }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: def.step as f32, value_text, + assigned: false, }, move |v| Message::ParamChanged(id, v), Message::ParamReleased(id), diff --git a/src/reverb/gui.rs b/src/reverb/gui.rs index 2274a59..05c12c4 100644 --- a/src/reverb/gui.rs +++ b/src/reverb/gui.rs @@ -20,10 +20,12 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ common::{ preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, panel, small_knob}, + ui::panel, }, reverb::{ params::{MODES, PARAMS, ParamId, value_text}, @@ -214,8 +216,8 @@ fn view(state: &State) -> Element<'_, Message> { } }; let (min, max) = (def.min, def.max); - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value: to_normalized(value), range: if logarithmic { @@ -226,6 +228,7 @@ fn view(state: &State) -> Element<'_, Message> { default: to_normalized(def.default as f32), step: if logarithmic { 0.001 } else { def.step as f32 }, value_text, + assigned: false, }, move |v| { Message::SetParam( diff --git a/src/sampler/gui.rs b/src/sampler/gui.rs index daa6e12..eeaac11 100644 --- a/src/sampler/gui.rs +++ b/src/sampler/gui.rs @@ -27,9 +27,9 @@ use maolan_clap::ffi::CLAP_WINDOW_API_WIN32; #[cfg(any(target_os = "linux", target_os = "freebsd"))] use maolan_clap::ffi::CLAP_WINDOW_API_X11; use maolan_widgets::adsr::{AdsrMessage, adsr_envelope}; -use maolan_widgets::arch_range_slider::ArchRangeSlider; -use maolan_widgets::arch_slider::{ArchSlider, arch_slider}; +use maolan_widgets::arch_slider::ArchSlider; use maolan_widgets::iced_aw::Wrap; +use maolan_widgets::knob::{Knob, RangeKnob, range_knob}; use maolan_widgets::meters; use maolan_widgets::multi_toggler::{LabelPosition, horizontal_multi_toggler}; use maolan_widgets::piano::{ @@ -2669,10 +2669,6 @@ fn mod_target_for_param(id: ParamId) -> Option { } } -fn assignment_color() -> Color { - Color::from_rgb(1.0, 0.83, 0.10) -} - fn small_knob<'a>( id: ParamId, label: &'a str, @@ -2682,54 +2678,31 @@ fn small_knob<'a>( let value = state.shared.params.get(id) as f32; let def = &PARAMS[id.as_index()]; let assigned = param_has_lfo_assignment(state, id); - let mut slider = arch_slider(def.min as f32..=def.max as f32, value, move |v| { - Message::SetParam(id, v) - }) - .step(step) - .double_click_reset(def.default as f32) - .on_release(Message::ReleaseParam(id)) - .fill_from_start() - .width(Length::Fixed(41.0)) - .height(Length::Fixed(41.0)); - if assigned { - slider = slider - .filled_color(Color::from_rgb(0.82, 0.58, 0.08)) - .handle_color(assignment_color()); - } - let value_text = if def.step >= 1.0 { format!("{value:.0}") } else { format!("{value:.2}") }; - - let content = container( - column![text(label).size(11), slider, text(value_text).size(10)] - .spacing(2) - .align_x(Alignment::Center), - ) - .width(Length::Fixed(50.0)) - .padding(2) - .style(move |_theme: &Theme| container::Style { - background: assigned.then(|| Background::Color(Color::from_rgba(1.0, 0.83, 0.10, 0.10))), - border: Border { - color: if assigned { - assignment_color() - } else { - Color::TRANSPARENT - }, - width: if assigned { 1.0 } else { 0.0 }, - radius: 3.0.into(), + let content = maolan_widgets::knob::knob( + Knob { + label: label.to_string(), + value, + range: def.min as f32..=def.max as f32, + default: def.default as f32, + step, + value_text, + assigned, }, - ..container::Style::default() - }); + move |value| Message::SetParam(id, value), + Message::ReleaseParam(id), + ); if mod_target_for_param(id).is_some() { mouse_area(content) .on_press(Message::AssignLfoToParam(id)) .into() } else { - content.into() + content } } @@ -4061,26 +4034,28 @@ fn group_controls_panel<'a>(state: &'a State, group: &SampleGroup) -> Element<'a ]), knob_row(vec![ keyswitch_knob("Previous", group.sw_previous, GroupEditField::SwPrevious), - knob_field( - "Lo - Hi", - ArchRangeSlider::new( - 0.0..=127.0, - f32::from(group.sw_lolast.or(group.sw_hilast).unwrap_or(0)), - f32::from(group.sw_hilast.or(group.sw_lolast).unwrap_or(0)), - Message::SetSelectedGroupSwLastRange, - ) - .step(1.0) - .width(Length::Fixed(41.0)) - .height(Length::Fixed(41.0)), - if group.sw_lolast.is_none() && group.sw_hilast.is_none() { - String::from("off") - } else { - format!( - "{} - {}", - group.sw_lolast.unwrap_or(0), - group.sw_hilast.unwrap_or(0) - ) + range_knob( + RangeKnob { + label: "Lo - Hi".into(), + low: f32::from(group.sw_lolast.or(group.sw_hilast).unwrap_or(0)), + high: f32::from(group.sw_hilast.or(group.sw_lolast).unwrap_or(0)), + range: 0.0..=127.0, + step: 1.0, + value_text: if group.sw_lolast.is_none() + && group.sw_hilast.is_none() + { + String::from("off") + } else { + format!( + "{} - {}", + group.sw_lolast.unwrap_or(0), + group.sw_hilast.unwrap_or(0) + ) + }, + assigned: false, }, + Message::SetSelectedGroupSwLastRange, + Message::None, ), keyswitch_knob("Default", group.sw_default, GroupEditField::SwDefault), ]), @@ -4725,14 +4700,19 @@ fn zone_range_knob<'a>( field: ZoneRangeField, value_text: String, ) -> Element<'a, Message> { - let knob = ArchRangeSlider::new(range, low, high, move |low, high| { - Message::SetEditingZoneRange(field, low, high) - }) - .step(step) - .width(Length::Fixed(41.0)) - .height(Length::Fixed(41.0)); - - knob_field(label, knob, value_text) + range_knob( + RangeKnob { + label: label.into(), + low, + high, + range, + step, + value_text, + assigned: false, + }, + move |low, high| Message::SetEditingZoneRange(field, low, high), + Message::None, + ) } fn reverse_toggler(reverse: bool) -> Element<'static, Message> { @@ -4908,18 +4888,18 @@ fn cc_condition_row<'a>(index: usize, condition: &CcCondition) -> Element<'a, Me .fill_from_start(), condition.cc.to_string(), ); - let range_knob = knob_field( - "Lo - Hi", - ArchRangeSlider::new( - 0.0..=127.0, - condition.low as f32, - condition.high as f32, - move |low, high| Message::SetEditingZoneCcConditionRange(index, low, high), - ) - .step(1.0) - .width(Length::Fixed(41.0)) - .height(Length::Fixed(41.0)), - format!("{} - {}", condition.low, condition.high), + let range_knob = range_knob( + RangeKnob { + label: "Lo - Hi".into(), + low: condition.low as f32, + high: condition.high as f32, + range: 0.0..=127.0, + step: 1.0, + value_text: format!("{} - {}", condition.low, condition.high), + assigned: false, + }, + move |low, high| Message::SetEditingZoneCcConditionRange(index, low, high), + Message::None, ); row![ @@ -5480,18 +5460,18 @@ fn view(state: &State) -> Element<'_, Message> { let bend_down = state.shared.params.get(ParamId::PitchBendDown) as f32; let bend_up = state.shared.params.get(ParamId::PitchBendUp) as f32; - let bend_range = knob_field( - "Bend", - ArchRangeSlider::new( - 0.0..=12000.0, - bend_down.min(bend_up), - bend_down.max(bend_up), - Message::SetPitchBendRange, - ) - .step(1.0) - .width(Length::Fixed(41.0)) - .height(Length::Fixed(41.0)), - format!("{bend_down:.0} - {bend_up:.0} c"), + let bend_range = range_knob( + RangeKnob { + label: "Bend".into(), + low: bend_down.min(bend_up), + high: bend_down.max(bend_up), + range: 0.0..=12000.0, + step: 1.0, + value_text: format!("{bend_down:.0} - {bend_up:.0} c"), + assigned: false, + }, + Message::SetPitchBendRange, + Message::None, ); let filter1: Element<'_, Message> = column![ diff --git a/src/saturator/gui.rs b/src/saturator/gui.rs index 048244c..d53aac0 100644 --- a/src/saturator/gui.rs +++ b/src/saturator/gui.rs @@ -20,11 +20,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, saturator::{ params::{PARAMS, ParamId}, plugin::SharedState, @@ -191,14 +190,15 @@ fn knob( format!("{value:.1} {units}") }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/stereo/gui.rs b/src/stereo/gui.rs index de700a4..00368ce 100644 --- a/src/stereo/gui.rs +++ b/src/stereo/gui.rs @@ -22,11 +22,10 @@ use maolan_widgets::multi_toggler::horizontal_multi_toggler; use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, stereo::{ params::{PARAMS, ParamId}, plugin::{SharedState, VectorscopeData}, @@ -723,14 +722,15 @@ fn knob( let def = PARAMS[id.as_index()]; let value_text = pretty_value(id, value, units); - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id), diff --git a/src/synth/gui.rs b/src/synth/gui.rs index 2c52f8a..e9639f9 100644 --- a/src/synth/gui.rs +++ b/src/synth/gui.rs @@ -19,7 +19,7 @@ use maolan_clap::ffi::CLAP_WINDOW_API_WIN32; #[cfg(any(target_os = "linux", target_os = "freebsd"))] use maolan_clap::ffi::CLAP_WINDOW_API_X11; use maolan_widgets::horizontal_slider::HorizontalSlider; -use maolan_widgets::knob::{Knob, knob}; +use maolan_widgets::knob::Knob; use maolan_widgets::multi_toggler::{LabelPosition, horizontal_multi_toggler}; mod envelope; mod oscillator_display; @@ -518,7 +518,7 @@ fn synth_knob(id: ParamId, label: &str, state: &State, step: f32) -> Element<'st let def = param_def(id).expect("valid param id"); let assigned = param_has_lfo_assignment(state, id); let display_value = visual_param_value(state, id, value); - let content = knob( + let content = maolan_widgets::knob::knob( Knob { label: label.to_string(), value: display_value, diff --git a/src/vocoder/gui.rs b/src/vocoder/gui.rs index d58f43c..fdf3ace 100644 --- a/src/vocoder/gui.rs +++ b/src/vocoder/gui.rs @@ -21,11 +21,10 @@ use maolan_baseview::iced::{ use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; +use maolan_widgets::knob::Knob; + use crate::{ - common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, - }, + common::preset::{self, PresetProvider, PresetUi}, vocoder::{ params::{PARAMS, ParamId}, plugin::SharedState, @@ -175,14 +174,15 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag ParamId::DryWet => format!("{:.0}%", value * 100.0), }; - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: def.step as f32, value_text, + assigned: false, }, move |v| Message::ParamChanged(id, v), Message::ParamReleased(id), diff --git a/src/wah/gui.rs b/src/wah/gui.rs index a6ac3df..c9f9b92 100644 --- a/src/wah/gui.rs +++ b/src/wah/gui.rs @@ -21,10 +21,9 @@ use maolan_baseview::iced::{ use raw_window_handle::RawWindowHandle; use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle}; -use crate::common::{ - preset::{self, PresetProvider, PresetUi}, - ui::{SmallKnob, small_knob}, -}; +use maolan_widgets::knob::Knob; + +use crate::common::preset::{self, PresetProvider, PresetUi}; use crate::wah::{ params::{MODE_LABELS, PARAMS, ParamId, SHAPE_LABELS}, plugin::SharedState, @@ -177,14 +176,15 @@ fn knob<'a>(id: ParamId, label: &'static str, state: &'a State) -> Element<'a, M let def = &PARAMS[id.as_index()]; let value_text = format_param(&state.shared, id); - small_knob( - SmallKnob { + maolan_widgets::knob::knob( + Knob { label: label.to_string(), value, range: def.min as f32..=def.max as f32, default: def.default as f32, step: def.step as f32, value_text, + assigned: false, }, move |v| Message::SetParam(id, v), Message::ReleaseParam(id),