1
0
Fork 0

Patch vizia to not require pub for lenses

This commit is contained in:
Robbert van der Helm 2022-03-23 23:29:49 +01:00
parent 9c608c77f9
commit d35276437d
8 changed files with 11 additions and 16 deletions

8
Cargo.lock generated
View file

@ -3607,7 +3607,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vizia" name = "vizia"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8772bc3f68441fb2ae89809b5c4624be4ae21da3" source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#78122bddc2bfc9ee27d84d2f4838a10f48becd34"
dependencies = [ dependencies = [
"vizia_baseview", "vizia_baseview",
"vizia_core", "vizia_core",
@ -3616,7 +3616,7 @@ dependencies = [
[[package]] [[package]]
name = "vizia_baseview" name = "vizia_baseview"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8772bc3f68441fb2ae89809b5c4624be4ae21da3" source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#78122bddc2bfc9ee27d84d2f4838a10f48becd34"
dependencies = [ dependencies = [
"baseview", "baseview",
"femtovg", "femtovg",
@ -3628,7 +3628,7 @@ dependencies = [
[[package]] [[package]]
name = "vizia_core" name = "vizia_core"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8772bc3f68441fb2ae89809b5c4624be4ae21da3" source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#78122bddc2bfc9ee27d84d2f4838a10f48becd34"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"copypasta", "copypasta",
@ -3651,7 +3651,7 @@ dependencies = [
[[package]] [[package]]
name = "vizia_derive" name = "vizia_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8772bc3f68441fb2ae89809b5c4624be4ae21da3" source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#78122bddc2bfc9ee27d84d2f4838a10f48becd34"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

View file

@ -63,8 +63,7 @@ enum ParamSliderEvent {
/// Internal param slider state the view needs to react to. /// Internal param slider state the view needs to react to.
#[derive(Lens)] #[derive(Lens)]
// TODO: Lens requires everything to be marked as `pub` struct ParamSliderInternal {
pub struct ParamSliderInternal {
/// What style to use for the slider. /// What style to use for the slider.
style: ParamSliderStyle, style: ParamSliderStyle,
/// Will be set to `true` when the field gets Alt+Click'ed which will replae the label with a /// Will be set to `true` when the field gets Alt+Click'ed which will replae the label with a

View file

@ -27,8 +27,7 @@ use crate::CrispParams;
const POINT_SCALE: f32 = 0.75; const POINT_SCALE: f32 = 0.75;
#[derive(Lens)] #[derive(Lens)]
// TODO: Lens requires everything to be marked as `pub` struct Data {
pub struct Data {
params: Pin<Arc<CrispParams>>, params: Pin<Arc<CrispParams>>,
} }

View file

@ -63,7 +63,7 @@ struct Crisp {
} }
#[derive(Params)] #[derive(Params)]
pub struct CrispParams { struct CrispParams {
/// On a range of `[0, 1]`, how much of the modulated sound to mix in. /// On a range of `[0, 1]`, how much of the modulated sound to mix in.
#[id = "amount"] #[id = "amount"]
amount: FloatParam, amount: FloatParam,

View file

@ -27,8 +27,7 @@ use crate::DiopserParams;
const POINT_SCALE: f32 = 0.75; const POINT_SCALE: f32 = 0.75;
#[derive(Lens)] #[derive(Lens)]
// TODO: Lens requires everything to be marked as `pub` struct Data {
pub struct Data {
params: Pin<Arc<DiopserParams>>, params: Pin<Arc<DiopserParams>>,
} }

View file

@ -80,7 +80,7 @@ struct Diopser {
// TODO: Some combinations of parameters can cause really loud resonance. We should limit the // TODO: Some combinations of parameters can cause really loud resonance. We should limit the
// resonance and filter stages parameter ranges in the GUI until the user unlocks. // resonance and filter stages parameter ranges in the GUI until the user unlocks.
#[derive(Params)] #[derive(Params)]
pub struct DiopserParams { struct DiopserParams {
/// The number of all-pass filters applied in series. /// The number of all-pass filters applied in series.
#[id = "stages"] #[id = "stages"]
filter_stages: IntParam, filter_stages: IntParam,

View file

@ -16,8 +16,7 @@ const POINT_SCALE: f32 = 0.75;
const STYLE: &str = r#""#; const STYLE: &str = r#""#;
#[derive(Lens)] #[derive(Lens)]
// TODO: Lens requires everything to be marked as `pub` struct Data {
pub struct Data {
params: Pin<Arc<GainParams>>, params: Pin<Arc<GainParams>>,
peak_meter: Arc<AtomicF32>, peak_meter: Arc<AtomicF32>,
} }

View file

@ -22,8 +22,7 @@ struct Gain {
} }
#[derive(Params)] #[derive(Params)]
// TODO: Lens requires everything to be marked as `pub` struct GainParams {
pub struct GainParams {
#[id = "gain"] #[id = "gain"]
pub gain: FloatParam, pub gain: FloatParam,
} }