alex/nih-plug
1
0
Fork 0
Code Activity

Update generic UI for upstream Vizia changes

Browse source
This commit is contained in:
Robbert van der Helm 2023-11-14 23:19:14 +01:00
parent 151a4ec29e
commit 669edc1df5
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nih_plug_vizia/assets/theme.css
View file

@ -11,7 +11,7 @@
font-weight: light; font-weight: light;
} }
scrollview scroll_content { scrollview > scroll_content {
/* Normally the scroll bar overlaps with the content, so we'll add a little offset to prevent that */ /* Normally the scroll bar overlaps with the content, so we'll add a little offset to prevent that */
child-right: 15px; child-right: 15px;
} }

19
nih_plug_vizia/assets/widgets.css
View file

@ -4,10 +4,12 @@
generic-ui { generic-ui {
child-space: 10px; child-space: 10px;
col-between: 5px; col-between: 5px;
/* Otherwise it doesn't interact correctly with scrollview */
height: auto;
layout-type: column; layout-type: column;
row-between: 5px; row-between: 5px;
} }
scrollview > vstack > generic-ui { scrollview > scroll_content > generic-ui {
child-space: 5px; child-space: 5px;
/* Our scrollview styling will already add some padding here */ /* Our scrollview styling will already add some padding here */
@ -16,6 +18,7 @@ scrollview > vstack > generic-ui {
generic-ui .row { generic-ui .row {
col-between: 6px; col-between: 6px;
height: auto;
layout-type: row; layout-type: row;
} }
@ -23,7 +26,6 @@ generic-ui .label {
left: 1s; left: 1s;
top: 1s; top: 1s;
bottom: 1s; bottom: 1s;
right: 0px;
} }
param-button { param-button {
@ -69,12 +71,7 @@ param-slider {
transition: background-color 100ms; transition: background-color 100ms;
} }
/* Vizia doesn't support commas in selectors */ param-slider:active,
/* Also, WTB Sass */
param-slider:active {
background-color: #8080801a;
transition: background-color 100ms;
}
param-slider:hover { param-slider:hover {
background-color: #8080801a; background-color: #8080801a;
transition: background-color 100ms; transition: background-color 100ms;
@ -139,11 +136,7 @@ resize-handle {
width: 20px; width: 20px;
z-index: 1337; z-index: 1337;
} }
resize-handle:active { resize-handle:active,
opacity: 0.8;
transition: opacity 100ms;
}
/* No commas in VIZIA */
resize-handle:hover { resize-handle:hover {
opacity: 0.8; opacity: 0.8;
transition: opacity 100ms; transition: opacity 100ms;

5
nih_plug_vizia/src/widgets/generic_ui.rs
View file

@ -30,9 +30,8 @@ impl GenericUi {
Ps: Params + 'static, Ps: Params + 'static,
{ {
// Basic styling is done in the `theme.css` style sheet // Basic styling is done in the `theme.css` style sheet
Self::new_custom(cx, params.clone(), move |cx, param_ptr| { Self::new_custom(cx, params, move |cx, param_ptr| {
let params = params.clone(); HStack::new(cx, |cx| {
HStack::new(cx, move |cx| {
// Align this on the right // Align this on the right
Label::new(cx, unsafe { param_ptr.name() }).class("label"); Label::new(cx, unsafe { param_ptr.name() }).class("label");