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

Cattpuccin Macchiato Re-theme

Browse Source
This commit is contained in:
Adalyn Black
2024-07-24 16:50:17 -07:00
committed by galister
parent 88da3c832a
commit e14b35bece
4 changed files with 196 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/overlays/keyboard.rs
View File

@@ -56,11 +56,12 @@ where
data,
)?;
canvas.bg_color = color_parse("#101010").unwrap(); //safe
canvas.panel(0., 0., size.x, size.y, 5.);
canvas.bg_color = color_parse("#181926").unwrap(); //safe
canvas.panel(0., 0., size.x, size.y, 12.);
canvas.font_size = 18;
canvas.bg_color = color_parse("#202020").unwrap(); //safe
canvas.fg_color = color_parse("#cad3f5").unwrap(); //safe
canvas.bg_color = color_parse("#1e2030").unwrap(); //safe
let has_altgr = keymap.as_ref().map_or(false, |k| k.has_altgr());
@@ -146,7 +147,7 @@ where
if label.is_empty() {
label = LAYOUT.label_for_key(key);
}
let button = canvas.key_button(x, y, w, h, 0., cap_type, &label);
let button = canvas.key_button(x, y, w, h, 12., cap_type, &label);
button.state = Some(state);
button.on_press = Some(key_press);
button.on_release = Some(key_release);
@@ -268,7 +269,7 @@ fn key_release(
}
}
static PRESS_COLOR: Vec4 = Vec4::new(1.0, 1.0, 1.0, 0.5);
static PRESS_COLOR: Vec4 = Vec4::new(198./255., 160./255., 246./255., 0.5);
fn test_highlight(
control: &Control<KeyboardData, KeyButtonData>,

16
src/overlays/toast.rs
View File

@@ -178,19 +178,19 @@ fn new_toast(toast: Toast, app: &mut AppState) -> Option<(OverlayState, Box<dyn
.ok()?;
canvas.font_size = FONT_SIZE;
canvas.fg_color = color_parse("#aaaaaa").unwrap(); // want panic
canvas.bg_color = color_parse("#333333").unwrap(); // want panic
canvas.panel(0., 0., size.0, size.1, 3.);
canvas.fg_color = color_parse("#cad3f5").unwrap(); // want panic
canvas.bg_color = color_parse("#1e2030").unwrap(); // want panic
canvas.panel(0., 0., size.0, size.1, 16.);
if toast.body.len() > 0 {
canvas.label(PADDING.0, 54., og_width, size.1 - 54., 3., toast.body);
canvas.fg_color = color_parse("#101010").unwrap(); // want panic
canvas.bg_color = color_parse("#666666").unwrap(); // want panic
canvas.panel(0., 0., size.0, 30., 3.);
canvas.label_centered(PADDING.0, 16., og_width, FONT_SIZE as f32 + 2., 3., title);
canvas.fg_color = color_parse("#b8c0e0").unwrap(); // want panic
canvas.bg_color = color_parse("#24273a").unwrap(); // want panic
canvas.panel(0., 0., size.0, 30., 16.);
canvas.label_centered(PADDING.0, 16., og_width, FONT_SIZE as f32 + 2., 16., title);
} else {
canvas.label_centered(PADDING.0, 0., og_width, size.1, 3., title);
canvas.label_centered(PADDING.0, 0., og_width, size.1, 16., title);
}
let state = OverlayState {

288
src/res/settings.yaml
View File

@@ -12,23 +12,23 @@ spawn_pos: [0, -0.1, -0.5]
elements:
- type: Panel
rect: [0, 0, 600, 800]
corner_radius: 2
bg_color: "#102030"
corner_radius: 8
bg_color: "#1e2030"
- type: Label
rect: [15, 35, 600, 70]
corner_radius: 2
corner_radius: 6
font_size: 24
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Settings
- type: Button
rect: [560, 0, 40, 40]
corner_radius: 2
corner_radius: 8
font_size: 16
bg_color: "#880000"
fg_color: "#ffffff"
bg_color: "#ed8796"
fg_color: "#24273a"
text: X
click_down:
- type: Window
@@ -37,38 +37,38 @@ elements:
- type: Panel
rect: [50, 53, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
####### Watch Section #######
- type: Label
rect: [15, 85, 570, 24]
corner_radius: 2
corner_radius: 6
font_size: 18
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Watch
- type: Panel
rect: [250, 105, 1, 100]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
- type: Label
rect: [288, 105, 100, 24]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Visibility
- type: Button
rect: [270, 120, 100, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Hide"
click_down:
- type: Watch
@@ -76,10 +76,10 @@ elements:
- type: Button
rect: [270, 170, 100, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Swap Hand"
click_down:
- type: Watch
@@ -87,23 +87,23 @@ elements:
- type: Panel
rect: [390, 105, 1, 100]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
- type: Label
rect: [430, 105, 120, 24]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Watch Fade
- type: Button
rect: [410, 120, 140, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Cutoff Point"
click_down:
- type: Toast
@@ -119,10 +119,10 @@ elements:
- type: Button
rect: [410, 170, 140, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Cutoff Strength"
click_down:
- type: Toast
@@ -138,18 +138,18 @@ elements:
- type: Label
rect: [25, 140, 90, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Rotation
- type: Button
rect: [108, 120, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "X"
click_down:
- type: Toast
@@ -165,10 +165,10 @@ elements:
- type: Button
rect: [153, 120, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Y"
click_down:
- type: Toast
@@ -184,10 +184,10 @@ elements:
- type: Button
rect: [198, 120, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Z"
click_down:
- type: Toast
@@ -203,18 +203,18 @@ elements:
- type: Label
rect: [25, 190, 90, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Position
- type: Button
rect: [108, 170, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "X"
click_down:
- type: Toast
@@ -230,10 +230,10 @@ elements:
- type: Button
rect: [153, 170, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Y"
click_down:
- type: Toast
@@ -249,10 +249,10 @@ elements:
- type: Button
rect: [198, 170, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#306060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Z"
click_down:
- type: Toast
@@ -268,32 +268,32 @@ elements:
- type: Panel
rect: [50, 220, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
####### Mirror Section #######
- type: Label
rect: [15, 255, 570, 24]
corner_radius: 2
corner_radius: 6
font_size: 18
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Mirrors
- type: Label
rect: [25, 290, 30, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: M1
- type: Button
rect: [60, 270, 110, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "Show/Hide"
click_down: # ToggleVisible if exists, else create
- type: Overlay
@@ -305,10 +305,10 @@ elements:
- type: Button
rect: [185, 270, 60, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "Lock"
click_down:
- type: Overlay
@@ -317,10 +317,10 @@ elements:
- type: Button
rect: [258, 270, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#880000"
fg_color: "#24273a"
bg_color: "#ed8796"
text: "X"
click_down:
- type: Window
@@ -329,18 +329,18 @@ elements:
- type: Label
rect: [25, 340, 30, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: M2
- type: Button
rect: [60, 320, 110, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "Show/Hide"
click_down:
- type: Overlay
@@ -352,10 +352,10 @@ elements:
- type: Button
rect: [185, 320, 60, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "Lock"
click_down:
- type: Overlay
@@ -364,10 +364,10 @@ elements:
- type: Button
rect: [258, 320, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#880000"
fg_color: "#24273a"
bg_color: "#ed8796"
text: "X"
click_down:
- type: Window
@@ -376,18 +376,18 @@ elements:
- type: Label
rect: [25, 390, 30, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: M3
- type: Button
rect: [60, 370, 110, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "Show/Hide"
click_down:
- type: Overlay
@@ -399,10 +399,10 @@ elements:
- type: Button
rect: [185, 370, 60, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "Lock"
click_down:
- type: Overlay
@@ -411,10 +411,10 @@ elements:
- type: Button
rect: [258, 370, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#880000"
fg_color: "#24273a"
bg_color: "#ed8796"
text: "X"
click_down:
- type: Window
@@ -423,33 +423,33 @@ elements:
- type: Panel
rect: [300, 240, 1, 200]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
####### Color Gain Section #######
- type: Label
rect: [325, 255, 90, 24]
corner_radius: 2
corner_radius: 6
font_size: 18
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Color Gain
- type: Label
rect: [470, 255, 90, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: (SteamVR)
- type: Button
rect: [330, 270, 60, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#707070"
fg_color: "#cad3f5"
bg_color: "#494d64"
text: "All"
click_down:
- type: Toast
@@ -465,10 +465,10 @@ elements:
- type: Button
rect: [405, 270, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#701010"
fg_color: "#24273a"
bg_color: "#e78284"
text: "R"
click_down:
- type: Toast
@@ -484,10 +484,10 @@ elements:
- type: Button
rect: [450, 270, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#107010"
fg_color: "#24273a"
bg_color: "#a6d189"
text: "G"
click_down:
- type: Toast
@@ -503,10 +503,10 @@ elements:
- type: Button
rect: [495, 270, 30, 30]
corner_radius: 2
corner_radius: 15
font_size: 12
fg_color: "#ffffff"
bg_color: "#101070"
fg_color: "#24273a"
bg_color: "#8caaee"
text: "B"
click_down:
- type: Toast
@@ -522,25 +522,25 @@ elements:
- type: Panel
rect: [325, 315, 225, 1]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
####### Playspace Section #######
- type: Label
rect: [325, 345, 90, 24]
corner_radius: 2
corner_radius: 6
font_size: 18
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Playspace
- type: Button
rect: [330, 360, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#206060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Fix Floor"
click_down:
- type: System
@@ -548,10 +548,10 @@ elements:
- type: Button
rect: [330, 410, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#206060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Reset Offset"
click_down:
- type: System
@@ -561,23 +561,23 @@ elements:
- type: Panel
rect: [50, 460, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
- type: Label
rect: [325, 490, 90, 24]
corner_radius: 2
corner_radius: 6
font_size: 18
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Notifications
- type: Button
rect: [330, 505, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#401010"
fg_color: "#24273a"
bg_color: "#e64553"
text: "Enabled"
click_down:
- type: System
@@ -586,10 +586,10 @@ elements:
- type: Button
rect: [330, 555, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#401010"
fg_color: "#24273a"
bg_color: "#e64553"
text: "Sound Enabled"
click_down:
- type: System
@@ -599,18 +599,18 @@ elements:
####### Behavior Section #######
- type: Label
rect: [15, 490, 570, 24]
corner_radius: 2
corner_radius: 6
font_size: 18
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Static
text: Behavior
- type: Button
rect: [30, 505, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#401010"
fg_color: "#24273a"
bg_color: "#e64553"
text: "Auto-Realign"
click_down:
- type: System
@@ -619,10 +619,10 @@ elements:
- type: Button
rect: [30, 555, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#401010"
fg_color: "#24273a"
bg_color: "#e64553"
text: "Grab+Scroll Slide"
click_down:
- type: System
@@ -633,15 +633,15 @@ elements:
- type: Panel
rect: [50, 605, 500, 1]
corner_radius: 2
bg_color: "#c0c0c0"
corner_radius: 6
bg_color: "#6e738d"
- type: Button
rect: [330, 625, 220, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#206060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Save Config"
click_down:
- type: System
@@ -651,10 +651,10 @@ elements:
- type: Button
rect: [30, 625, 250, 30]
corner_radius: 2
corner_radius: 6
font_size: 12
fg_color: "#ffffff"
bg_color: "#206060"
fg_color: "#24273a"
bg_color: "#eed49f"
text: "Save Overlay Layout"
click_down:
- type: System

76
src/res/watch.yaml
View File

@@ -10,15 +10,15 @@ elements:
# background panel
- type: Panel
rect: [0, 0, 400, 200]
corner_radius: 3
bg_color: "#353535"
corner_radius: 4
bg_color: "#24273a"
- type: Button
rect: [2, 162, 26, 36]
corner_radius: 3
corner_radius: 4
font_size: 14
bg_color: "#808040"
fg_color: "#ffffff"
bg_color: "#c6a0f6"
fg_color: "#24273a"
text: "C"
click_up: # destroy if exists, otherwise create
- type: Window
@@ -31,10 +31,10 @@ elements:
# Keyboard button
- type: Button
rect: [32, 162, 60, 36]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#FFFFFF"
bg_color: "#406050"
fg_color: "#24273a"
bg_color: "#a6da95"
text: Kbd
click_up:
- type: Overlay
@@ -66,10 +66,10 @@ elements:
# bottom row, of keyboard + overlays
- type: OverlayList
rect: [94, 160, 306, 40]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#FFFFFF"
bg_color: "#405060"
fg_color: "#cad3f5"
bg_color: "#1e2030"
layout: Horizontal
click_up: ToggleVisible
long_click_up: Reset
@@ -83,9 +83,9 @@ elements:
# local clock
- type: Label
rect: [19, 90, 200, 50]
corner_radius: 3
corner_radius: 4
font_size: 46 # Use 32 for 12-hour time
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Clock
format: "%H:%M" # 23:59
#format: "%I:%M %p" # 11:59 PM
@@ -93,18 +93,18 @@ elements:
# local date
- type: Label
rect: [20, 117, 200, 20]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Clock
format: "%x" # local date representation
# local day-of-week
- type: Label
rect: [20, 137, 200, 50]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#ffffff"
fg_color: "#cad3f5"
source: Clock
format: "%A" # Tuesday
#format: "%a" # Tue
@@ -112,69 +112,69 @@ elements:
# alt clock 1
- type: Label
rect: [210, 90, 200, 50]
corner_radius: 3
corner_radius: 4
font_size: 24 # Use 18 for 12-hour time
fg_color: "#99BBAA"
fg_color: "#8bd5ca"
source: Clock
timezone: "Asia/Tokyo" # change TZ1 here
format: "%H:%M" # 23:59
#format: "%I:%M %p" # 11:59 PM
- type: Label
rect: [210, 60, 200, 50]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#99BBAA"
fg_color: "#8bd5ca"
source: Static
text: "Tokyo" # change TZ1 label here
# alt clock 2
- type: Label
rect: [210, 150, 200, 50]
corner_radius: 3
corner_radius: 4
font_size: 24 # Use 18 for 12-hour time
fg_color: "#AA99BB"
fg_color: "#b7bdf8"
source: Clock
timezone: "America/Chicago" # change TZ2 here
format: "%H:%M" # 23:59
#format: "%I:%M %p" # 11:59 PM
- type: Label
rect: [210, 120, 200, 50]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#AA99BB"
fg_color: "#b7bdf8"
source: Static
text: "Chicago" # change TZ2 label here
# batteries
- type: BatteryList
rect: [0, 0, 400, 30]
corner_radius: 3
corner_radius: 4
font_size: 14
fg_color: "#99BBAA"
fg_color: "#8bd5ca"
fg_color_low: "#B06060"
fg_color_charging: "#6080A0"
num_devices: 9
layout: Horizontal
low_threshold: 20
low_threshold: 33
# volume buttons
- type: Button
rect: [327, 52, 46, 32]
corner_radius: 3
rect: [315, 52, 70, 32]
corner_radius: 4
font_size: 14
fg_color: "#FFFFFF"
bg_color: "#505050"
text: "+"
fg_color: "#cad3f5"
bg_color: "#5b6078"
text: "Vol +"
click_down:
- type: Exec
command: [ "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%" ]
- type: Button
rect: [327, 116, 46, 32]
corner_radius: 3
rect: [315, 116, 70, 32]
corner_radius: 4
font_size: 14
fg_color: "#FFFFFF"
bg_color: "#505050"
text: "-"
fg_color: "#cad3f5"
bg_color: "#5b6078"
text: "Vol -"
click_down:
- type: Exec
command: [ "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%" ]