Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slider animations, ui tweaks

Browse Source
This commit is contained in:
Aleksander
2025-06-28 23:11:37 +02:00
parent 9d0c0f015c
commit 9bbc7b2d22
5 changed files with 133 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wgui/src/parser/component_button.rs
View File

@@ -4,7 +4,7 @@ use crate::{
layout::WidgetID,
parser::{
ParserContext, ParserFile, iter_attribs,
style::{parse_color, parse_round, parse_style, parse_text_style},
style::{parse_color, parse_color_opt, parse_round, parse_style, parse_text_style},
},
widget::util::WLength,
};
@@ -16,7 +16,7 @@ pub fn parse_component_button<'a, U1, U2>(
parent_id: WidgetID,
) -> anyhow::Result<()> {
let mut color = Color::new(1.0, 1.0, 1.0, 1.0);
let mut border_color = Color::new(0.0, 0.0, 0.0, 1.0);
let mut border_color: Option<Color> = None;
let mut round = WLength::Units(4.0);
let mut text = String::default();
@@ -37,19 +37,28 @@ pub fn parse_component_button<'a, U1, U2>(
parse_color(&value, &mut color);
}
"border_color" => {
parse_color(&value, &mut border_color);
parse_color_opt(&value, &mut border_color);
}
_ => {}
}
}
// slight border outlines by default
if border_color.is_none() {
border_color = Some(Color::lerp(
&color,
&Color::new(0.0, 0.0, 0.0, color.a),
0.3,
));
}
let _button = button::construct(
ctx.layout,
ctx.listeners,
parent_id,
button::Params {
color,
border_color,
border_color: border_color.unwrap(),
text: &text,
style,
text_style,