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

wgui: make component names PascalCase

Browse Source
This commit is contained in:
Aleksander
2025-08-17 21:03:17 +02:00
parent d54f74ed3c
commit cf0dd55a0f
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
uidev/assets/gui/various_widgets.xml
View File

@@ -11,17 +11,17 @@
<div margin_left="16" gap="8" flex_direction="column"> <div margin_left="16" gap="8" flex_direction="column">
<label id="label_current_option" text="Click any of these buttons" size="20" weight="bold" /> <label id="label_current_option" text="Click any of these buttons" size="20" weight="bold" />
<div gap="4"> <div gap="4">
<button id="button_red" text="Red button" width="220" height="32" color="#FF0000" /> <Button id="button_red" text="Red button" width="220" height="32" color="#FF0000" />
<button id="button_aqua" text="Aqua button" width="220" height="32" color="#00FFFF" /> <Button id="button_aqua" text="Aqua button" width="220" height="32" color="#00FFFF" />
<button id="button_yellow" text="Yellow button" width="220" height="32" color="#FFFF00" /> <Button id="button_yellow" text="Yellow button" width="220" height="32" color="#FFFF00" />
</div> </div>
<button id="button_click_me" text="Click me" width="128" height="24" color="#FFFFFF" /> <Button id="button_click_me" text="Click me" width="128" height="24" color="#FFFFFF" />
<div gap="8" align_items="center"> <div gap="8" align_items="center">
<check_box id="cb_first" text="I'm a checkbox!" /> <CheckBox id="cb_first" text="I'm a checkbox!" />
<check_box text="and me too!" /> <CheckBox text="and me too!" />
<check_box text="i'm tall" box_size="32" /> <CheckBox text="i'm tall" box_size="32" />
<check_box text="i'm checked by default" checked="1" /> <CheckBox text="i'm checked by default" checked="1" />
</div> </div>
<label text="custom attrib test, you should see three rectangles below, each of them in R, G and B" /> <label text="custom attrib test, you should see three rectangles below, each of them in R, G and B" />
@@ -39,13 +39,13 @@
<rectangle width="128" height="2" /> <rectangle width="128" height="2" />
<label text="range 0-100 value 25" /> <label text="range 0-100 value 25" />
<slider width="200" height="16" min_value="0" max_value="100" value="25" /> <Slider width="200" height="16" min_value="0" max_value="100" value="25" />
<label text="range 10-20 value 15" /> <label text="range 10-20 value 15" />
<slider width="200" height="16" min_value="10" max_value="20" value="15" /> <Slider width="200" height="16" min_value="10" max_value="20" value="15" />
<label text="range -10-42 value 0" /> <label text="range -10-42 value 0" />
<slider width="200" height="16" min_value="-10" max_value="42" value="0" /> <Slider width="200" height="16" min_value="-10" max_value="42" value="0" />
</div> </div>
<div flex_direction="column" gap="8"> <div flex_direction="column" gap="8">
@@ -54,13 +54,13 @@
<rectangle width="128" height="2" /> <rectangle width="128" height="2" />
<label text="range 0-100 value 25" /> <label text="range 0-100 value 25" />
<slider width="200" height="24" min_value="0" max_value="100" value="25" /> <Slider width="200" height="24" min_value="0" max_value="100" value="25" />
<label text="range 10-20 value 15" /> <label text="range 10-20 value 15" />
<slider width="200" height="24" min_value="10" max_value="20" value="15" /> <Slider width="200" height="24" min_value="10" max_value="20" value="15" />
<label text="range -10-42 value 0" /> <label text="range -10-42 value 0" />
<slider width="200" height="24" min_value="-10" max_value="42" value="0" /> <Slider width="200" height="24" min_value="-10" max_value="42" value="0" />
</div> </div>
<div flex_direction="column" gap="8"> <div flex_direction="column" gap="8">
@@ -69,13 +69,13 @@
<rectangle width="128" height="2" /> <rectangle width="128" height="2" />
<label text="range 0-100 value 25" /> <label text="range 0-100 value 25" />
<slider width="200" height="32" min_value="0" max_value="100" value="25" /> <Slider width="200" height="32" min_value="0" max_value="100" value="25" />
<label text="range 10-20 value 15" /> <label text="range 10-20 value 15" />
<slider width="200" height="32" min_value="10" max_value="20" value="15" /> <Slider width="200" height="32" min_value="10" max_value="20" value="15" />
<label text="range -10-42 value 0" /> <label text="range -10-42 value 0" />
<slider width="200" height="32" min_value="-10" max_value="42" value="0" /> <Slider width="200" height="32" min_value="-10" max_value="42" value="0" />
</div> </div>
</div> </div>
</rectangle> </rectangle>

6
wgui/src/parser/mod.rs
View File

@@ -660,13 +660,13 @@ fn parse_child<'a, U1, U2>(
"sprite" => { "sprite" => {
new_widget_id = Some(parse_widget_sprite(file, ctx, child_node, parent_id)?); new_widget_id = Some(parse_widget_sprite(file, ctx, child_node, parent_id)?);
} }
"button" => { "Button" => {
new_widget_id = Some(parse_component_button(file, ctx, child_node, parent_id)?); new_widget_id = Some(parse_component_button(file, ctx, child_node, parent_id)?);
} }
"slider" => { "Slider" => {
new_widget_id = Some(parse_component_slider(file, ctx, child_node, parent_id)?); new_widget_id = Some(parse_component_slider(file, ctx, child_node, parent_id)?);
} }
"check_box" => { "CheckBox" => {
new_widget_id = Some(parse_component_checkbox(file, ctx, child_node, parent_id)?); new_widget_id = Some(parse_component_checkbox(file, ctx, child_node, parent_id)?);
} }
"" => { /* ignore */ } "" => { /* ignore */ }

2
wlx-overlay-s/src/assets/gui/bar.xml
View File

@@ -21,7 +21,7 @@
</rectangle> </rectangle>
<rectangle padding="8" gap="8" round="100%" color="~bg_color_active" justify_content="center" align_items="center"> <rectangle padding="8" gap="8" round="100%" color="~bg_color_active" justify_content="center" align_items="center">
<label size="18" translation="BAR.OPACITY" color="~text_color" /> <label size="18" translation="BAR.OPACITY" color="~text_color" />
<slider width="150" height="24" min_value="0" max_value="100" value="100" /> <Slider width="150" height="24" min_value="0" max_value="100" value="100" />
<label size="18" translation="BAR.ADDITIVE" color="~text_color" /> <label size="18" translation="BAR.ADDITIVE" color="~text_color" />
<sprite color="~device_color" width="20" height="20" src="bar/checkbox-checked.svg" /> <sprite color="~device_color" width="20" height="20" src="bar/checkbox-checked.svg" />
</rectangle> </rectangle>