Skip to content

Update to newer egui-baseview #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peastman merged 1 commit into from
Jan 4, 2026
Merged

Update to newer egui-baseview #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ crate-type = ["cdylib", "lib"]

[dependencies]
chorus = { path = "../chorus" }
nih_plug = { git = "https://github.com/peastman/nih-plug.git", rev = "980290b3b91696d9038f2d9ba463128a8657c21c", features = ["standalone"] }
nih_plug_egui = { git = "https://github.com/peastman/nih-plug.git", rev = "980290b3b91696d9038f2d9ba463128a8657c21c" }
egui_extras = "0.31.0"
egui_commonmark = "0.20.0"
nih_plug = { git = "https://github.com/robbert-vdh/nih-plug.git", rev = "28b149ec4d62757d0b448809148a0c3ca6e09a95", features = ["standalone"] }
nih_plug_egui = { git = "https://codeberg.org/BillyDM/egui-baseview", branch = "egui_33" }
egui_extras = "0.33.0"
egui_commonmark = "0.22.0"

[profile.release]
lto = "thin"
Expand Down
15 changes: 8 additions & 7 deletions plugin/src/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ pub fn draw_editor(params: Arc<ChorusExMachinaParams>, sender: Arc<Mutex<mpsc::S
create_egui_editor(
params.editor_state.clone(),
(),
|_, _| {},
move |ctx, setter, _state| {
Default::default(),
|_, _, _| {},
move |ctx, setter, _queue, _state| {
egui::CentralPanel::default().show(ctx, |ui| {
egui::SidePanel::left("tabs").max_width(100.0).resizable(false).show_inside(ui, |ui| {
let mut state = state.lock().unwrap();
Expand Down Expand Up @@ -89,7 +90,7 @@ fn draw_controls_panel(ui: &mut egui::Ui, params: &Arc<ChorusExMachinaParams>, s
});
ui.add_space(10.0);
ui.label("Voices");
ui.add(egui::Slider::new(&mut new_voice_count, 1..=8));
ui.add(egui::Slider::new(&mut new_voice_count, 1..=8).handle_shape(egui::style::HandleShape::Circle));
});
if params.voice_part.value() != new_voice_part || params.voice_count.value() != new_voice_count {
setter.begin_set_parameter(&params.voice_part);
Expand Down Expand Up @@ -122,15 +123,15 @@ fn draw_controls_panel(ui: &mut egui::Ui, params: &Arc<ChorusExMachinaParams>, s
draw_param_slider(ui, &params.exciter_strength, setter);
ui.label("Time Spread (ms)");
let mut spread = params.time_spread.value();
if ui.add(egui::Slider::new(&mut spread, 0..=100)).changed() {
if ui.add(egui::Slider::new(&mut spread, 0..=100).handle_shape(egui::style::HandleShape::Circle)).changed() {
setter.begin_set_parameter(&params.time_spread);
setter.set_parameter(&params.time_spread, spread);
setter.end_set_parameter(&params.time_spread);
}
ui.end_row();
ui.label("Vowel Delay (ms)");
let mut delay = params.vowel_delay.value();
if ui.add(egui::Slider::new(&mut delay, 0..=250)).changed() {
if ui.add(egui::Slider::new(&mut delay, 0..=250).handle_shape(egui::style::HandleShape::Circle)).changed() {
setter.begin_set_parameter(&params.vowel_delay);
setter.set_parameter(&params.vowel_delay, delay);
setter.end_set_parameter(&params.vowel_delay);
Expand All @@ -154,7 +155,7 @@ fn draw_controls_panel(ui: &mut egui::Ui, params: &Arc<ChorusExMachinaParams>, s
fn draw_param_slider(ui: &mut egui::Ui, param: &FloatParam, setter: &ParamSetter) {
ui.label(param.name());
let mut value = param.value();
if ui.add(egui::Slider::new(&mut value, 0.0..=1.0)).changed() {
if ui.add(egui::Slider::new(&mut value, 0.0..=1.0).handle_shape(egui::style::HandleShape::Circle)).changed() {
setter.begin_set_parameter(param);
setter.set_parameter(param, value);
setter.end_set_parameter(param);
Expand Down Expand Up @@ -194,7 +195,7 @@ fn draw_text_panel(ui: &mut egui::Ui, params: &Arc<ChorusExMachinaParams>, sette
clicked = response.clicked();
}
else {
let width = ui.fonts(|f| f.glyph_width(&egui::TextStyle::Body.resolve(ui.style()), ' '));
let width = ui.fonts_mut(|f| f.glyph_width(&egui::TextStyle::Body.resolve(ui.style()), ' '));
ui.spacing_mut().item_spacing.x = width;
for s in phrases[row_index].split_whitespace() {
match Syllable::build(s) {
Expand Down