diff options
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | src/gui.rs | 10 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -19,8 +19,7 @@ clack-extensions = { path = "../clack/extensions", features = [ "state", "latency", ] } -baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "237d323c729f3aa99476ba3efa50129c5e86cad3", version = "0.1.0" } -egui-baseview = { git = "https://codeberg.org/BillyDM/egui-baseview.git", version = "0.7.0" } +egui-baseview = { git = "https://codeberg.org/RustAudio/egui-baseview.git", version = "0.2.7" } # for calculation realfft = { version = "3.5.0", features = ["avx", "neon", "sse"] } @@ -31,6 +30,7 @@ atomic_float = "1.1.0" # for saving the state serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.150" +egui = "0.34.3" [profile.release] opt-level = 3 @@ -5,12 +5,12 @@ use crate::{ window_type::WindowType, }; use atomic_float::AtomicF32; -use baseview::{Size, WindowHandle, WindowOpenOptions, WindowScalePolicy, gl::GlConfig}; use clack_extensions::gui::{GuiApiType, GuiConfiguration, GuiSize, PluginGuiImpl, Window}; use clack_plugin::prelude::*; +use egui::{Align, CentralPanel, ComboBox, Context, Layout, Slider, Ui, Vec2, ViewportCommand}; use egui_baseview::{ EguiWindow, GraphicsConfig, Queue, - egui::{Align, CentralPanel, ComboBox, Context, Layout, Slider, Vec2, ViewportCommand}, + baseview::{Size, WindowHandle, WindowOpenOptions, WindowScalePolicy, gl::GlConfig}, }; use std::sync::{Arc, atomic::Ordering}; @@ -108,10 +108,10 @@ impl RetainPluginGui { move |ctx: &Context, _queue: &mut Queue, _state: &mut AppState| { tx.send(ctx.clone()).unwrap(); }, - |ctx: &Context, _queue: &mut Queue, state: &mut AppState| { - ctx.send_viewport_cmd(ViewportCommand::InnerSize(state.gui_size.as_vec2())); + |ui: &mut Ui, _queue: &mut Queue, state: &mut AppState| { + ui.send_viewport_cmd(ViewportCommand::InnerSize(state.gui_size.as_vec2())); - CentralPanel::default().show(ctx, |ui| { + CentralPanel::default().show_inside(ui, |ui| { ui.heading("Retain"); ui.horizontal(|ui| { @@ -58,7 +58,7 @@ impl DefaultPluginFactory for RetainPlugin { } fn new_shared(host: HostSharedHandle<'_>) -> Result<Self::Shared<'_>, PluginError> { - Ok(RetainPluginShared::new(host)) + Ok(Self::Shared::new(host)) } fn new_main_thread<'a>( |
