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

Moved corner radius property to be separate from the rect struct

Browse Source
This commit is contained in:
Adalyn Black
2024-07-23 22:28:40 -07:00
committed by galister
parent f27c320231
commit 32e0e7656a
7 changed files with 198 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/canvas/builder.rs
View File

@@ -39,10 +39,11 @@ impl<D, S> CanvasBuilder<D, S> {
} }
// Creates a panel with bg_color inherited from the canvas // Creates a panel with bg_color inherited from the canvas
pub fn panel(&mut self, x: f32, y: f32, w: f32, h: f32, r: f32) -> &mut Control<D, S> { pub fn panel(&mut self, x: f32, y: f32, w: f32, h: f32, radius: f32) -> &mut Control<D, S> {
let idx = self.canvas.controls.len(); let idx = self.canvas.controls.len();
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r }, rect: Rect { x, y, w, h },
corner_radius: radius,
bg_color: self.bg_color, bg_color: self.bg_color,
on_render_bg: Some(Control::render_rounded_rect), on_render_bg: Some(Control::render_rounded_rect),
..Control::new() ..Control::new()
@@ -51,10 +52,11 @@ impl<D, S> CanvasBuilder<D, S> {
} }
// Creates a label with fg_color, font_size inherited from the canvas // Creates a label with fg_color, font_size inherited from the canvas
pub fn label(&mut self, x: f32, y: f32, w: f32, h: f32, r: f32, text: Arc<str>) -> &mut Control<D, S> { pub fn label(&mut self, x: f32, y: f32, w: f32, h: f32, radius: f32, text: Arc<str>) -> &mut Control<D, S> {
let idx = self.canvas.controls.len(); let idx = self.canvas.controls.len();
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r }, rect: Rect { x, y, w, h },
corner_radius: radius,
text, text,
fg_color: self.fg_color, fg_color: self.fg_color,
size: self.font_size, size: self.font_size,
@@ -72,12 +74,13 @@ impl<D, S> CanvasBuilder<D, S> {
y: f32, y: f32,
w: f32, w: f32,
h: f32, h: f32,
r: f32, radius: f32,
text: Arc<str>, text: Arc<str>,
) -> &mut Control<D, S> { ) -> &mut Control<D, S> {
let idx = self.canvas.controls.len(); let idx = self.canvas.controls.len();
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r }, rect: Rect { x, y, w, h },
corner_radius: radius,
text, text,
fg_color: self.fg_color, fg_color: self.fg_color,
size: self.font_size, size: self.font_size,
@@ -91,7 +94,8 @@ impl<D, S> CanvasBuilder<D, S> {
pub fn sprite(&mut self, x: f32, y: f32, w: f32, h: f32) -> &mut Control<D, S> { pub fn sprite(&mut self, x: f32, y: f32, w: f32, h: f32) -> &mut Control<D, S> {
let idx = self.canvas.controls.len(); let idx = self.canvas.controls.len();
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r: 0. }, rect: Rect { x, y, w, h },
corner_radius: 0.,
on_render_bg: Some(Control::render_sprite_bg), on_render_bg: Some(Control::render_sprite_bg),
..Control::new() ..Control::new()
}); });
@@ -102,7 +106,8 @@ impl<D, S> CanvasBuilder<D, S> {
pub fn sprite_interactive(&mut self, x: f32, y: f32, w: f32, h: f32) -> &mut Control<D, S> { pub fn sprite_interactive(&mut self, x: f32, y: f32, w: f32, h: f32) -> &mut Control<D, S> {
let idx = self.canvas.controls.len(); let idx = self.canvas.controls.len();
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r: 0. }, rect: Rect { x, y, w, h },
corner_radius: 0.,
on_render_bg: Some(Control::render_sprite_bg), on_render_bg: Some(Control::render_sprite_bg),
on_render_hl: Some(Control::render_sprite_hl), on_render_hl: Some(Control::render_sprite_hl),
..Control::new() ..Control::new()
@@ -111,12 +116,13 @@ impl<D, S> CanvasBuilder<D, S> {
} }
// Creates a button with fg_color, bg_color, font_size inherited from the canvas // Creates a button with fg_color, bg_color, font_size inherited from the canvas
pub fn button(&mut self, x: f32, y: f32, w: f32, h: f32, r: f32, text: Arc<str>) -> &mut Control<D, S> { pub fn button(&mut self, x: f32, y: f32, w: f32, h: f32, radius: f32, text: Arc<str>) -> &mut Control<D, S> {
let idx = self.canvas.controls.len(); let idx = self.canvas.controls.len();
self.canvas.interactive_set_idx(x, y, w, h, idx); self.canvas.interactive_set_idx(x, y, w, h, idx);
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r }, rect: Rect { x, y, w, h },
corner_radius: radius,
text, text,
fg_color: self.fg_color, fg_color: self.fg_color,
bg_color: self.bg_color, bg_color: self.bg_color,
@@ -136,7 +142,7 @@ impl<D, S> CanvasBuilder<D, S> {
y: f32, y: f32,
w: f32, w: f32,
h: f32, h: f32,
r: f32, radius: f32,
cap_type: KeyCapType, cap_type: KeyCapType,
label: &[String], label: &[String],
) -> &mut Control<D, S> { ) -> &mut Control<D, S> {
@@ -144,7 +150,8 @@ impl<D, S> CanvasBuilder<D, S> {
self.canvas.interactive_set_idx(x, y, w, h, idx); self.canvas.interactive_set_idx(x, y, w, h, idx);
self.canvas.controls.push(Control { self.canvas.controls.push(Control {
rect: Rect { x, y, w, h, r }, rect: Rect { x, y, w, h },
corner_radius: radius,
bg_color: self.bg_color, bg_color: self.bg_color,
on_render_bg: Some(Control::render_rounded_rect), on_render_bg: Some(Control::render_rounded_rect),
on_render_hl: Some(Control::render_highlight), on_render_hl: Some(Control::render_highlight),
@@ -159,7 +166,6 @@ impl<D, S> CanvasBuilder<D, S> {
y, y,
w, w,
h: h - self.font_size as f32, h: h - self.font_size as f32,
r: 0.,
}; };
vec![(render, rect, 1f32)] vec![(render, rect, 1f32)]
} }
@@ -170,14 +176,12 @@ impl<D, S> CanvasBuilder<D, S> {
y: y + (self.font_size as f32) + 12., y: y + (self.font_size as f32) + 12.,
w, w,
h, h,
r: 0.,
}; };
let rect1 = Rect { let rect1 = Rect {
x: x + w * 0.5 + 12., x: x + w * 0.5 + 12.,
y: y + h - (self.font_size as f32) + 8., y: y + h - (self.font_size as f32) + 8.,
w, w,
h, h,
r: 0.,
}; };
vec![(render, rect0, 1.0), (render, rect1, 0.8)] vec![(render, rect0, 1.0), (render, rect1, 0.8)]
} }
@@ -188,14 +192,12 @@ impl<D, S> CanvasBuilder<D, S> {
y: y + 2.0, y: y + 2.0,
w, w,
h: h * 0.5, h: h * 0.5,
r: 0.,
}; };
let rect1 = Rect { let rect1 = Rect {
x, x,
y: y + h * 0.5 + 2.0, y: y + h * 0.5 + 2.0,
w, w,
h: h * 0.5, h: h * 0.5,
r: 0.,
}; };
vec![(render, rect1, 1.0), (render, rect0, 0.8)] vec![(render, rect1, 1.0), (render, rect0, 0.8)]
} }
@@ -206,21 +208,18 @@ impl<D, S> CanvasBuilder<D, S> {
y: y + (self.font_size as f32) + 8., y: y + (self.font_size as f32) + 8.,
w, w,
h, h,
r: 0.,
}; };
let rect1 = Rect { let rect1 = Rect {
x: x + 12., x: x + 12.,
y: y + h - (self.font_size as f32) + 4., y: y + h - (self.font_size as f32) + 4.,
w, w,
h, h,
r: 0.,
}; };
let rect2 = Rect { let rect2 = Rect {
x: x + w * 0.5 + 8., x: x + w * 0.5 + 8.,
y: y + h - (self.font_size as f32) + 4., y: y + h - (self.font_size as f32) + 4.,
w, w,
h, h,
r: 0.,
}; };
vec![ vec![
(render, rect1, 1.0), (render, rect1, 1.0),

5
src/gui/canvas/control.rs
View File

@@ -25,6 +25,7 @@ pub type ControlRendererHl<D, S> = fn(
pub(crate) struct Control<D, S> { pub(crate) struct Control<D, S> {
pub state: Option<S>, pub state: Option<S>,
pub rect: Rect, pub rect: Rect,
pub corner_radius: f32,
pub fg_color: GuiColor, pub fg_color: GuiColor,
pub bg_color: GuiColor, pub bg_color: GuiColor,
pub text: Arc<str>, pub text: Arc<str>,
@@ -52,8 +53,8 @@ impl<D, S> Control<D, S> {
y: 0., y: 0.,
w: 0., w: 0.,
h: 0., h: 0.,
r: 0.,
}, },
corner_radius: 0.,
fg_color: Vec4::ONE, fg_color: Vec4::ONE,
bg_color: Vec4::ZERO, bg_color: Vec4::ZERO,
text: Arc::from(""), text: Arc::from(""),
@@ -113,7 +114,7 @@ impl<D, S> Control<D, S> {
cmd_buffer: &mut WlxCommandBuffer, cmd_buffer: &mut WlxCommandBuffer,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let pass = { let pass = {
let r = self.rect.r.min(self.rect.w / 2.0).min(self.rect.h / 2.0); let r = self.corner_radius.min(self.rect.w / 2.0).min(self.rect.h / 2.0);
let rw = r / canvas.width as f32; let rw = r / canvas.width as f32;
let ruw = r / self.rect.w as f32; let ruw = r / self.rect.w as f32;
let rh = r / canvas.height as f32; let rh = r / canvas.height as f32;

1
src/gui/canvas/mod.rs
View File

@@ -26,7 +26,6 @@ pub struct Rect {
y: f32, y: f32,
w: f32, w: f32,
h: f32, h: f32,
r: f32,
} }
pub struct CanvasData<D> { pub struct CanvasData<D> {

48
src/gui/modular/mod.rs
View File

@@ -53,18 +53,21 @@ pub struct OverlayListTemplate {
#[serde(tag = "type")] #[serde(tag = "type")]
pub enum ModularElement { pub enum ModularElement {
Panel { Panel {
rect: [f32; 5], rect: [f32; 4],
corner_radius: f32,
bg_color: Arc<str>, bg_color: Arc<str>,
}, },
Label { Label {
rect: [f32; 5], rect: [f32; 4],
corner_radius: f32,
font_size: isize, font_size: isize,
fg_color: Arc<str>, fg_color: Arc<str>,
#[serde(flatten)] #[serde(flatten)]
data: LabelContent, data: LabelContent,
}, },
CenteredLabel { CenteredLabel {
rect: [f32; 5], rect: [f32; 4],
corner_radius: f32,
font_size: isize, font_size: isize,
fg_color: Arc<str>, fg_color: Arc<str>,
#[serde(flatten)] #[serde(flatten)]
@@ -76,7 +79,8 @@ pub enum ModularElement {
sprite_st: Option<[f32; 4]>, sprite_st: Option<[f32; 4]>,
}, },
Button { Button {
rect: [f32; 5], rect: [f32; 4],
corner_radius: f32,
font_size: isize, font_size: isize,
fg_color: Arc<str>, fg_color: Arc<str>,
bg_color: Arc<str>, bg_color: Arc<str>,
@@ -86,7 +90,8 @@ pub enum ModularElement {
}, },
/// Convenience type to save you from having to create a bunch of labels /// Convenience type to save you from having to create a bunch of labels
BatteryList { BatteryList {
rect: [f32; 5], rect: [f32; 4],
corner_radius: f32,
font_size: isize, font_size: isize,
fg_color: Arc<str>, fg_color: Arc<str>,
fg_color_low: Arc<str>, fg_color_low: Arc<str>,
@@ -96,7 +101,8 @@ pub enum ModularElement {
layout: ListLayout, layout: ListLayout,
}, },
OverlayList { OverlayList {
rect: [f32; 5], rect: [f32; 4],
corner_radius: f32,
font_size: isize, font_size: isize,
fg_color: Arc<str>, fg_color: Arc<str>,
bg_color: Arc<str>, bg_color: Arc<str>,
@@ -139,32 +145,35 @@ pub fn modular_canvas(
for elem in elements.iter() { for elem in elements.iter() {
match elem { match elem {
ModularElement::Panel { ModularElement::Panel {
rect: [x, y, w, h, r], rect: [x, y, w, h],
corner_radius,
bg_color, bg_color,
} => { } => {
canvas.bg_color = color_parse(bg_color).unwrap_or(*FALLBACK_COLOR); canvas.bg_color = color_parse(bg_color).unwrap_or(*FALLBACK_COLOR);
canvas.panel(*x, *y, *w, *h, *r); canvas.panel(*x, *y, *w, *h, *corner_radius);
} }
ModularElement::Label { ModularElement::Label {
rect: [x, y, w, h, r], rect: [x, y, w, h],
corner_radius,
font_size, font_size,
fg_color, fg_color,
data, data,
} => { } => {
canvas.font_size = *font_size; canvas.font_size = *font_size;
canvas.fg_color = color_parse(fg_color).unwrap_or(*FALLBACK_COLOR); canvas.fg_color = color_parse(fg_color).unwrap_or(*FALLBACK_COLOR);
let label = canvas.label(*x, *y, *w, *h, *r, empty_str.clone()); let label = canvas.label(*x, *y, *w, *h, *corner_radius, empty_str.clone());
modular_label_init(label, data); modular_label_init(label, data);
} }
ModularElement::CenteredLabel { ModularElement::CenteredLabel {
rect: [x, y, w, h, r], rect: [x, y, w, h],
corner_radius,
font_size, font_size,
fg_color, fg_color,
data, data,
} => { } => {
canvas.font_size = *font_size; canvas.font_size = *font_size;
canvas.fg_color = color_parse(fg_color).unwrap_or(*FALLBACK_COLOR); canvas.fg_color = color_parse(fg_color).unwrap_or(*FALLBACK_COLOR);
let label = canvas.label_centered(*x, *y, *w, *h, *r, empty_str.clone()); let label = canvas.label_centered(*x, *y, *w, *h, *corner_radius, empty_str.clone());
modular_label_init(label, data); modular_label_init(label, data);
} }
ModularElement::Sprite { ModularElement::Sprite {
@@ -187,7 +196,8 @@ pub fn modular_canvas(
} }
}, },
ModularElement::Button { ModularElement::Button {
rect: [x, y, w, h, r], rect: [x, y, w, h],
corner_radius,
font_size, font_size,
bg_color, bg_color,
fg_color, fg_color,
@@ -197,11 +207,12 @@ pub fn modular_canvas(
canvas.bg_color = color_parse(bg_color).unwrap_or(*FALLBACK_COLOR); canvas.bg_color = color_parse(bg_color).unwrap_or(*FALLBACK_COLOR);
canvas.fg_color = color_parse(fg_color).unwrap_or(*FALLBACK_COLOR); canvas.fg_color = color_parse(fg_color).unwrap_or(*FALLBACK_COLOR);
canvas.font_size = *font_size; canvas.font_size = *font_size;
let button = canvas.button(*x, *y, *w, *h, *r, text.clone()); let button = canvas.button(*x, *y, *w, *h, *corner_radius, text.clone());
modular_button_init(button, data); modular_button_init(button, data);
} }
ModularElement::BatteryList { ModularElement::BatteryList {
rect: [x, y, w, h, r], rect: [x, y, w, h],
corner_radius,
font_size, font_size,
fg_color, fg_color,
fg_color_low, fg_color_low,
@@ -229,7 +240,7 @@ pub fn modular_canvas(
button_y + 2., button_y + 2.,
button_w - 4., button_w - 4.,
button_h - 4., button_h - 4.,
*r, *corner_radius,
empty_str.clone(), empty_str.clone(),
); );
modular_label_init( modular_label_init(
@@ -253,7 +264,8 @@ pub fn modular_canvas(
} }
} }
ModularElement::OverlayList { ModularElement::OverlayList {
rect: [x, y, w, h, r], rect: [x, y, w, h],
corner_radius,
font_size, font_size,
fg_color, fg_color,
bg_color, bg_color,
@@ -278,7 +290,7 @@ pub fn modular_canvas(
button_y + 2., button_y + 2.,
button_w - 4., button_w - 4.,
button_h - 4., button_h - 4.,
*r, *corner_radius,
screen.name.clone(), screen.name.clone(),
); );

9
src/res/anchor.yaml
View File

@@ -11,15 +11,18 @@ spawn_pos: [0, 0, -1]
elements: elements:
- type: Panel - type: Panel
rect: [98, 0, 4, 200, 2] rect: [98, 0, 4, 200]
corner_radius: 0
bg_color: "#ffff00" bg_color: "#ffff00"
- type: Panel - type: Panel
rect: [0, 98, 200, 4, 2] rect: [0, 98, 200, 4]
corner_radius: 0
bg_color: "#ffff00" bg_color: "#ffff00"
- type: Label - type: Label
rect: [8, 90, 600, 70, 2] rect: [8, 90, 600, 70]
corner_radius: 0
font_size: 18 font_size: 18
fg_color: "#ffff00" fg_color: "#ffff00"
source: Static source: Static

168
src/res/settings.yaml
View File

@@ -11,18 +11,21 @@ spawn_pos: [0, -0.1, -0.5]
elements: elements:
- type: Panel - type: Panel
rect: [0, 0, 600, 800, 2] rect: [0, 0, 600, 800]
corner_radius: 2
bg_color: "#102030" bg_color: "#102030"
- type: Label - type: Label
rect: [15, 35, 600, 70, 2] rect: [15, 35, 600, 70]
corner_radius: 2
font_size: 24 font_size: 24
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Settings text: Settings
- type: Button - type: Button
rect: [560, 0, 40, 40, 2] rect: [560, 0, 40, 40]
corner_radius: 2
font_size: 16 font_size: 16
bg_color: "#880000" bg_color: "#880000"
fg_color: "#ffffff" fg_color: "#ffffff"
@@ -33,31 +36,36 @@ elements:
action: Destroy action: Destroy
- type: Panel - type: Panel
rect: [50, 53, 500, 1, 2] rect: [50, 53, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
####### Watch Section ####### ####### Watch Section #######
- type: Label - type: Label
rect: [15, 85, 570, 24, 2] rect: [15, 85, 570, 24]
corner_radius: 2
font_size: 18 font_size: 18
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Watch text: Watch
- type: Panel - type: Panel
rect: [250, 105, 1, 100, 2] rect: [250, 105, 1, 100]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
- type: Label - type: Label
rect: [288, 105, 100, 24, 2] rect: [288, 105, 100, 24]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Visibility text: Visibility
- type: Button - type: Button
rect: [270, 120, 100, 30, 2] rect: [270, 120, 100, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -67,7 +75,8 @@ elements:
action: Hide action: Hide
- type: Button - type: Button
rect: [270, 170, 100, 30, 2] rect: [270, 170, 100, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -77,18 +86,21 @@ elements:
action: SwitchHands action: SwitchHands
- type: Panel - type: Panel
rect: [390, 105, 1, 100, 2] rect: [390, 105, 1, 100]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
- type: Label - type: Label
rect: [430, 105, 120, 24, 2] rect: [430, 105, 120, 24]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Watch Fade text: Watch Fade
- type: Button - type: Button
rect: [410, 120, 140, 30, 2] rect: [410, 120, 140, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -106,7 +118,8 @@ elements:
ViewAngle: {kind: "MaxOpacity", delta: -0.01} ViewAngle: {kind: "MaxOpacity", delta: -0.01}
- type: Button - type: Button
rect: [410, 170, 140, 30, 2] rect: [410, 170, 140, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -124,14 +137,16 @@ elements:
ViewAngle: {kind: "MinOpacity", delta: -0.01} ViewAngle: {kind: "MinOpacity", delta: -0.01}
- type: Label - type: Label
rect: [25, 140, 90, 30, 2] rect: [25, 140, 90, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Rotation text: Rotation
- type: Button - type: Button
rect: [108, 120, 30, 30, 2] rect: [108, 120, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -149,7 +164,8 @@ elements:
Rotation: {axis: "X", delta: -0.25} Rotation: {axis: "X", delta: -0.25}
- type: Button - type: Button
rect: [153, 120, 30, 30, 2] rect: [153, 120, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -167,7 +183,8 @@ elements:
Rotation: {axis: "Y", delta: -0.25} Rotation: {axis: "Y", delta: -0.25}
- type: Button - type: Button
rect: [198, 120, 30, 30, 2] rect: [198, 120, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -185,14 +202,16 @@ elements:
Rotation: {axis: "Z", delta: -0.25} Rotation: {axis: "Z", delta: -0.25}
- type: Label - type: Label
rect: [25, 190, 90, 30, 2] rect: [25, 190, 90, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Position text: Position
- type: Button - type: Button
rect: [108, 170, 30, 30, 2] rect: [108, 170, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -210,7 +229,8 @@ elements:
Position: {axis: "X", delta: -0.001} Position: {axis: "X", delta: -0.001}
- type: Button - type: Button
rect: [153, 170, 30, 30, 2] rect: [153, 170, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -228,7 +248,8 @@ elements:
Position: {axis: "Y", delta: -0.001} Position: {axis: "Y", delta: -0.001}
- type: Button - type: Button
rect: [198, 170, 30, 30, 2] rect: [198, 170, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#306060" bg_color: "#306060"
@@ -246,26 +267,30 @@ elements:
Position: {axis: "Z", delta: -0.001} Position: {axis: "Z", delta: -0.001}
- type: Panel - type: Panel
rect: [50, 220, 500, 1, 2] rect: [50, 220, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
####### Mirror Section ####### ####### Mirror Section #######
- type: Label - type: Label
rect: [15, 255, 570, 24, 2] rect: [15, 255, 570, 24]
corner_radius: 2
font_size: 18 font_size: 18
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Mirrors text: Mirrors
- type: Label - type: Label
rect: [25, 290, 30, 30, 2] rect: [25, 290, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: M1 text: M1
- type: Button - type: Button
rect: [60, 270, 110, 30, 2] rect: [60, 270, 110, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -279,7 +304,8 @@ elements:
action: ShowMirror # only fires if not exists action: ShowMirror # only fires if not exists
- type: Button - type: Button
rect: [185, 270, 60, 30, 2] rect: [185, 270, 60, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -290,7 +316,8 @@ elements:
action: ToggleInteraction action: ToggleInteraction
- type: Button - type: Button
rect: [258, 270, 30, 30, 2] rect: [258, 270, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#880000" bg_color: "#880000"
@@ -301,14 +328,16 @@ elements:
action: Destroy action: Destroy
- type: Label - type: Label
rect: [25, 340, 30, 30, 2] rect: [25, 340, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: M2 text: M2
- type: Button - type: Button
rect: [60, 320, 110, 30, 2] rect: [60, 320, 110, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -322,7 +351,8 @@ elements:
action: ShowMirror action: ShowMirror
- type: Button - type: Button
rect: [185, 320, 60, 30, 2] rect: [185, 320, 60, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -333,7 +363,8 @@ elements:
action: ToggleInteraction action: ToggleInteraction
- type: Button - type: Button
rect: [258, 320, 30, 30, 2] rect: [258, 320, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#880000" bg_color: "#880000"
@@ -344,14 +375,16 @@ elements:
action: Destroy action: Destroy
- type: Label - type: Label
rect: [25, 390, 30, 30, 2] rect: [25, 390, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: M3 text: M3
- type: Button - type: Button
rect: [60, 370, 110, 30, 2] rect: [60, 370, 110, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -365,7 +398,8 @@ elements:
action: ShowMirror action: ShowMirror
- type: Button - type: Button
rect: [185, 370, 60, 30, 2] rect: [185, 370, 60, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -376,7 +410,8 @@ elements:
action: ToggleInteraction action: ToggleInteraction
- type: Button - type: Button
rect: [258, 370, 30, 30, 2] rect: [258, 370, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#880000" bg_color: "#880000"
@@ -387,27 +422,31 @@ elements:
action: Destroy action: Destroy
- type: Panel - type: Panel
rect: [300, 240, 1, 200, 2] rect: [300, 240, 1, 200]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
####### Color Gain Section ####### ####### Color Gain Section #######
- type: Label - type: Label
rect: [325, 255, 90, 24, 2] rect: [325, 255, 90, 24]
corner_radius: 2
font_size: 18 font_size: 18
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Color Gain text: Color Gain
- type: Label - type: Label
rect: [470, 255, 90, 30, 2] rect: [470, 255, 90, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: (SteamVR) text: (SteamVR)
- type: Button - type: Button
rect: [330, 270, 60, 30, 2] rect: [330, 270, 60, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#707070" bg_color: "#707070"
@@ -425,7 +464,8 @@ elements:
delta: -0.01 delta: -0.01
- type: Button - type: Button
rect: [405, 270, 30, 30, 2] rect: [405, 270, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#701010" bg_color: "#701010"
@@ -443,7 +483,8 @@ elements:
delta: -0.01 delta: -0.01
- type: Button - type: Button
rect: [450, 270, 30, 30, 2] rect: [450, 270, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#107010" bg_color: "#107010"
@@ -461,7 +502,8 @@ elements:
delta: -0.01 delta: -0.01
- type: Button - type: Button
rect: [495, 270, 30, 30, 2] rect: [495, 270, 30, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#101070" bg_color: "#101070"
@@ -479,20 +521,23 @@ elements:
delta: -0.01 delta: -0.01
- type: Panel - type: Panel
rect: [325, 315, 225, 1, 2] rect: [325, 315, 225, 1]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
####### Playspace Section ####### ####### Playspace Section #######
- type: Label - type: Label
rect: [325, 345, 90, 24, 2] rect: [325, 345, 90, 24]
corner_radius: 2
font_size: 18 font_size: 18
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Playspace text: Playspace
- type: Button - type: Button
rect: [330, 360, 220, 30, 2] rect: [330, 360, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#206060" bg_color: "#206060"
@@ -502,7 +547,8 @@ elements:
action: PlayspaceFixFloor action: PlayspaceFixFloor
- type: Button - type: Button
rect: [330, 410, 220, 30, 2] rect: [330, 410, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#206060" bg_color: "#206060"
@@ -514,18 +560,21 @@ elements:
####### Notifications Section ####### ####### Notifications Section #######
- type: Panel - type: Panel
rect: [50, 460, 500, 1, 2] rect: [50, 460, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
- type: Label - type: Label
rect: [325, 490, 90, 24, 2] rect: [325, 490, 90, 24]
corner_radius: 2
font_size: 18 font_size: 18
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Notifications text: Notifications
- type: Button - type: Button
rect: [330, 505, 220, 30, 2] rect: [330, 505, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#401010" bg_color: "#401010"
@@ -536,7 +585,8 @@ elements:
highlight: Notifications highlight: Notifications
- type: Button - type: Button
rect: [330, 555, 220, 30, 2] rect: [330, 555, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#401010" bg_color: "#401010"
@@ -548,14 +598,16 @@ elements:
####### Behavior Section ####### ####### Behavior Section #######
- type: Label - type: Label
rect: [15, 490, 570, 24, 2] rect: [15, 490, 570, 24]
corner_radius: 2
font_size: 18 font_size: 18
fg_color: "#ffffff" fg_color: "#ffffff"
source: Static source: Static
text: Behavior text: Behavior
- type: Button - type: Button
rect: [30, 505, 220, 30, 2] rect: [30, 505, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#401010" bg_color: "#401010"
@@ -566,7 +618,8 @@ elements:
highlight: AutoRealign highlight: AutoRealign
- type: Button - type: Button
rect: [30, 555, 220, 30, 2] rect: [30, 555, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#401010" bg_color: "#401010"
@@ -579,11 +632,13 @@ elements:
####### Footer Section ####### ####### Footer Section #######
- type: Panel - type: Panel
rect: [50, 605, 500, 1, 2] rect: [50, 605, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0" bg_color: "#c0c0c0"
- type: Button - type: Button
rect: [330, 625, 220, 30, 2] rect: [330, 625, 220, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#206060" bg_color: "#206060"
@@ -595,7 +650,8 @@ elements:
message: Settings saved successfully. message: Settings saved successfully.
- type: Button - type: Button
rect: [30, 625, 250, 30, 2] rect: [30, 625, 250, 30]
corner_radius: 2
font_size: 12 font_size: 12
fg_color: "#ffffff" fg_color: "#ffffff"
bg_color: "#206060" bg_color: "#206060"

42
src/res/watch.yaml
View File

@@ -9,11 +9,13 @@ size: [400, 200]
elements: elements:
# background panel # background panel
- type: Panel - type: Panel
rect: [0, 0, 400, 200, 3] rect: [0, 0, 400, 200]
corner_radius: 3
bg_color: "#353535" bg_color: "#353535"
- type: Button - type: Button
rect: [2, 162, 26, 36, 3] rect: [2, 162, 26, 36]
corner_radius: 3
font_size: 14 font_size: 14
bg_color: "#808040" bg_color: "#808040"
fg_color: "#ffffff" fg_color: "#ffffff"
@@ -28,7 +30,8 @@ elements:
# Keyboard button # Keyboard button
- type: Button - type: Button
rect: [32, 162, 60, 36, 3] rect: [32, 162, 60, 36]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#FFFFFF" fg_color: "#FFFFFF"
bg_color: "#406050" bg_color: "#406050"
@@ -62,7 +65,8 @@ elements:
# bottom row, of keyboard + overlays # bottom row, of keyboard + overlays
- type: OverlayList - type: OverlayList
rect: [94, 160, 306, 40, 3] rect: [94, 160, 306, 40]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#FFFFFF" fg_color: "#FFFFFF"
bg_color: "#405060" bg_color: "#405060"
@@ -78,7 +82,8 @@ elements:
# local clock # local clock
- type: Label - type: Label
rect: [19, 90, 200, 50, 3] rect: [19, 90, 200, 50]
corner_radius: 3
font_size: 46 # Use 32 for 12-hour time font_size: 46 # Use 32 for 12-hour time
fg_color: "#ffffff" fg_color: "#ffffff"
source: Clock source: Clock
@@ -87,7 +92,8 @@ elements:
# local date # local date
- type: Label - type: Label
rect: [20, 117, 200, 20, 3] rect: [20, 117, 200, 20]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#ffffff" fg_color: "#ffffff"
source: Clock source: Clock
@@ -95,7 +101,8 @@ elements:
# local day-of-week # local day-of-week
- type: Label - type: Label
rect: [20, 137, 200, 50, 3] rect: [20, 137, 200, 50]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#ffffff" fg_color: "#ffffff"
source: Clock source: Clock
@@ -104,7 +111,8 @@ elements:
# alt clock 1 # alt clock 1
- type: Label - type: Label
rect: [210, 90, 200, 50, 3] rect: [210, 90, 200, 50]
corner_radius: 3
font_size: 24 # Use 18 for 12-hour time font_size: 24 # Use 18 for 12-hour time
fg_color: "#99BBAA" fg_color: "#99BBAA"
source: Clock source: Clock
@@ -112,7 +120,8 @@ elements:
format: "%H:%M" # 23:59 format: "%H:%M" # 23:59
#format: "%I:%M %p" # 11:59 PM #format: "%I:%M %p" # 11:59 PM
- type: Label - type: Label
rect: [210, 60, 200, 50, 3] rect: [210, 60, 200, 50]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#99BBAA" fg_color: "#99BBAA"
source: Static source: Static
@@ -120,7 +129,8 @@ elements:
# alt clock 2 # alt clock 2
- type: Label - type: Label
rect: [210, 150, 200, 50, 3] rect: [210, 150, 200, 50]
corner_radius: 3
font_size: 24 # Use 18 for 12-hour time font_size: 24 # Use 18 for 12-hour time
fg_color: "#AA99BB" fg_color: "#AA99BB"
source: Clock source: Clock
@@ -128,7 +138,8 @@ elements:
format: "%H:%M" # 23:59 format: "%H:%M" # 23:59
#format: "%I:%M %p" # 11:59 PM #format: "%I:%M %p" # 11:59 PM
- type: Label - type: Label
rect: [210, 120, 200, 50, 3] rect: [210, 120, 200, 50]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#AA99BB" fg_color: "#AA99BB"
source: Static source: Static
@@ -136,7 +147,8 @@ elements:
# batteries # batteries
- type: BatteryList - type: BatteryList
rect: [0, 0, 400, 30, 3] rect: [0, 0, 400, 30]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#99BBAA" fg_color: "#99BBAA"
fg_color_low: "#B06060" fg_color_low: "#B06060"
@@ -147,7 +159,8 @@ elements:
# volume buttons # volume buttons
- type: Button - type: Button
rect: [327, 52, 46, 32, 3] rect: [327, 52, 46, 32]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#FFFFFF" fg_color: "#FFFFFF"
bg_color: "#505050" bg_color: "#505050"
@@ -156,7 +169,8 @@ elements:
- type: Exec - type: Exec
command: [ "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%" ] command: [ "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%" ]
- type: Button - type: Button
rect: [327, 116, 46, 32, 3] rect: [327, 116, 46, 32]
corner_radius: 3
font_size: 14 font_size: 14
fg_color: "#FFFFFF" fg_color: "#FFFFFF"
bg_color: "#505050" bg_color: "#505050"