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

fix srgb in uidev mode, tweak colors a bit

Browse Source 
[skip ci]
This commit is contained in:
Aleksander
2025-12-26 20:58:17 +01:00
parent a44aa2e426
commit d8625f770c
9 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dash-frontend/assets/gui/dashboard.xml
View File

@@ -15,6 +15,7 @@
height="~side_button_size" height="~side_button_size"
color="#44444400" color="#44444400"
hover_color="#333333ff" hover_color="#333333ff"
border_color="#00000000"
hover_border_color="#555555ff" hover_border_color="#555555ff"
tooltip="${tooltip}" tooltip="${tooltip}"
tooltip_side="${tooltip_side}" tooltip_side="${tooltip_side}"
@@ -24,11 +25,8 @@
</template> </template>
<elements> <elements>
<!-- background for testing -->
<!-- <rectangle position="absolute" color="#333333" width="100%" height="100%" /> -->
<!-- left/right separator (menu and rest) --> <!-- left/right separator (menu and rest) -->
<div flex_direction="row" gap="8" width="100%" height="100%"> <div flex_direction="row" gap="8" width="100%" height="100%" padding="4" interactable="0">
<!-- LEFT MENU --> <!-- LEFT MENU -->
<div id="menu" <div id="menu"
width="~size_size" width="~size_size"
@@ -69,7 +67,7 @@
<rectangle <rectangle
id="rect_content" id="rect_content"
color2="#0d131a00" color2="#0d131a00"
color="#24417900" color="#252f5300"
gradient="vertical" gradient="vertical"
round="8" round="8"
flex_grow="1" flex_grow="1"
@@ -79,7 +77,7 @@
<!-- radial gradient --> <!-- radial gradient -->
<rectangle <rectangle
position="absolute" width="100%" height="100%" position="absolute" width="100%" height="100%"
gradient="radial" color="#44BBFF22" color2="#00000000" /> gradient="radial" color="#44BBFF11" color2="#00000000" />
<div <div
id="content" id="content"
@@ -124,7 +122,7 @@
<!-- top shine --> <!-- top shine -->
<div position="absolute" width="100%" height="100%" justify_content="center"> <div position="absolute" width="100%" height="100%" justify_content="center">
<rectangle position="absolute" width="99%" height="2" color="#FFFFFF66" round="4" /> <rectangle position="absolute" width="99%" height="2" color="#FFFFFF22" round="4" />
</div> </div>
<!-- Left bottom side --> <!-- Left bottom side -->

6
dash-frontend/assets/gui/view/popup_window.xml
View File

@@ -19,7 +19,7 @@
> >
<!-- Shine effect at the top --> <!-- Shine effect at the top -->
<rectangle position="absolute" width="100%" height="2" round="4" color="#ffffff55" /> <rectangle position="absolute" width="100%" height="2" round="4" color="#ffffff22" />
<!-- Top bar contents --> <!-- Top bar contents -->
<div gap="16" align_items="center"> <div gap="16" align_items="center">
@@ -35,8 +35,8 @@
<!-- Content --> <!-- Content -->
<rectangle height="100%" <rectangle height="100%"
color="#010310ee" color="#010310fe"
color2="#062a5eee" color2="#051c55fc"
gradient="vertical" gradient="vertical"
padding="16" padding="16"
id="content"> id="content">

8
dash-frontend/src/tab/settings.rs
View File

@@ -116,14 +116,6 @@ impl TabSettings {
None, None,
)?; )?;
init_setting_checkbox(
frontend,
&tasks,
state.data.fetch_component_as::<ComponentCheckbox>("cb_am_pm_clock")?,
SettingType::DashAmPmClock,
Some(FrontendTask::RefreshClock),
)?;
init_setting_checkbox( init_setting_checkbox(
frontend, frontend,
&tasks, &tasks,

20
dash-frontend/src/views/game_list.rs
View File

@@ -125,7 +125,7 @@ pub struct Games {
manifests: Vec<steam_utils::AppManifest>, manifests: Vec<steam_utils::AppManifest>,
} }
const BORDER_COLOR_DEFAULT: drawing::Color = drawing::Color::new(1.0, 1.0, 1.0, 0.3); const BORDER_COLOR_DEFAULT: drawing::Color = drawing::Color::new(0.0, 0.0, 0.0, 0.35);
const BORDER_COLOR_HOVERED: drawing::Color = drawing::Color::new(1.0, 1.0, 1.0, 1.0); const BORDER_COLOR_HOVERED: drawing::Color = drawing::Color::new(1.0, 1.0, 1.0, 1.0);
const GAME_COVER_SIZE_X: f32 = 140.0; const GAME_COVER_SIZE_X: f32 = 140.0;
@@ -153,7 +153,7 @@ fn construct_game_cover(
let (widget_button, button) = components::button::construct( let (widget_button, button) = components::button::construct(
ess, ess,
components::button::Params { components::button::Params {
color: Some(drawing::Color::new(1.0, 1.0, 1.0, 0.1)), color: Some(drawing::Color::new(1.0, 1.0, 1.0, 0.0)),
border_color: Some(BORDER_COLOR_DEFAULT), border_color: Some(BORDER_COLOR_DEFAULT),
hover_border_color: Some(BORDER_COLOR_HOVERED), hover_border_color: Some(BORDER_COLOR_HOVERED),
round: WLength::Units(12.0), round: WLength::Units(12.0),
@@ -216,8 +216,8 @@ fn construct_game_cover(
let (top_shine, _) = ess.layout.add_child( let (top_shine, _) = ess.layout.add_child(
widget_button.id, widget_button.id,
rect_gradient( rect_gradient(
drawing::Color::new(1.0, 1.0, 1.0, 0.25), drawing::Color::new(1.0, 1.0, 1.0, 0.2),
drawing::Color::new(1.0, 1.0, 1.0, 0.0), drawing::Color::new(1.0, 1.0, 1.0, 0.02),
), ),
rect_gradient_style(taffy::AlignSelf::Baseline, 0.05), rect_gradient_style(taffy::AlignSelf::Baseline, 0.05),
)?; )?;
@@ -229,7 +229,7 @@ fn construct_game_cover(
ess.layout.add_child( ess.layout.add_child(
widget_button.id, widget_button.id,
rect_gradient( rect_gradient(
drawing::Color::new(1.0, 1.0, 1.0, 0.2), drawing::Color::new(1.0, 1.0, 1.0, 0.15),
drawing::Color::new(1.0, 1.0, 1.0, 0.0), drawing::Color::new(1.0, 1.0, 1.0, 0.0),
), ),
rect_gradient_style(taffy::AlignSelf::Baseline, 0.5), rect_gradient_style(taffy::AlignSelf::Baseline, 0.5),
@@ -249,10 +249,10 @@ fn construct_game_cover(
ess.layout.add_child( ess.layout.add_child(
widget_button.id, widget_button.id,
rect_gradient( rect_gradient(
drawing::Color::new(0.0, 0.0, 0.0, 0.0), drawing::Color::new(0.0, 0.0, 0.0, 0.1),
drawing::Color::new(0.0, 0.0, 0.0, 0.5), drawing::Color::new(0.0, 0.0, 0.0, 0.9),
), ),
rect_gradient_style(taffy::AlignSelf::End, 0.1), rect_gradient_style(taffy::AlignSelf::End, 0.05),
)?; )?;
// request cover image data from the internet or disk cache // request cover image data from the internet or disk cache
@@ -376,7 +376,7 @@ impl View {
fn mount_image(layout: &mut Layout, cell: &Cell, glyph: &CustomGlyphData) -> anyhow::Result<()> { fn mount_image(layout: &mut Layout, cell: &Cell, glyph: &CustomGlyphData) -> anyhow::Result<()> {
let image = WidgetImage::create(WidgetImageParams { let image = WidgetImage::create(WidgetImageParams {
round: WLength::Units(12.0), round: WLength::Units(10.0),
glyph_data: Some(glyph.clone()), glyph_data: Some(glyph.clone()),
..Default::default() ..Default::default()
}); });
@@ -413,7 +413,7 @@ impl View {
size: Some(16.0), size: Some(16.0),
align: Some(HorizontalAlign::Center), align: Some(HorizontalAlign::Center),
shadow: Some(TextShadow { shadow: Some(TextShadow {
color: drawing::Color::new(0.0, 0.0, 0.0, 0.5), color: drawing::Color::new(0.0, 0.0, 0.0, 1.0),
x: 2.0, x: 2.0,
y: 2.0, y: 2.0,
}), }),

2
uidev/src/vulkan.rs
View File

@@ -118,7 +118,7 @@ pub fn init_window(
device, device,
queue_gfx, queue_gfx,
queue_xfer, queue_xfer,
vulkano::format::Format::B8G8R8A8_UNORM, vulkano::format::Format::R8G8B8A8_SRGB,
); );
Ok((me, event_loop, window, surface)) Ok((me, event_loop, window, surface))
} }

2
wgui/assets/wgui/window_frame.xml
View File

@@ -11,7 +11,7 @@
round="16" round="16"
border="2" border="2"
border_color="#ffffff33" border_color="#ffffff33"
color="#081020ee" color="#080c20fa"
padding="2"> padding="2">
<!-- window title --> <!-- window title -->
<div width="100%" height="32" align_items="center" position="relative" justify_content="end"> <div width="100%" height="32" align_items="center" position="relative" justify_content="end">

4
wgui/src/components/button.rs
View File

@@ -412,13 +412,13 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
let border_color = if let Some(border_color) = params.border_color { let border_color = if let Some(border_color) = params.border_color {
border_color border_color
} else { } else {
Color::new(color.r, color.g, color.b, color.a + 0.4) Color::new(color.r, color.g, color.b, color.a + 0.25)
}; };
let hover_color = if let Some(hover_color) = params.hover_color { let hover_color = if let Some(hover_color) = params.hover_color {
hover_color hover_color
} else { } else {
Color::new(color.r + 0.25, color.g + 0.25, color.g + 0.25, color.a + 0.25) Color::new(color.r + 0.25, color.g + 0.25, color.g + 0.25, color.a + 0.15)
}; };
let hover_border_color = if let Some(hover_border_color) = params.hover_border_color { let hover_border_color = if let Some(hover_border_color) = params.hover_border_color {

2
wgui/src/components/slider.rs
View File

@@ -482,7 +482,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
WidgetLabelParams { WidgetLabelParams {
content: Translation::default(), content: Translation::default(),
style: TextStyle { style: TextStyle {
color: Some(drawing::Color::new(0.0, 0.0, 0.0, 0.75)), // always black color: Some(drawing::Color::new(0.0, 0.0, 0.0, 1.0)), // always black
weight: Some(FontWeight::Bold), weight: Some(FontWeight::Bold),
align: Some(HorizontalAlign::Center), align: Some(HorizontalAlign::Center),
..Default::default() ..Default::default()

2
wgui/src/globals.rs
View File

@@ -33,7 +33,7 @@ impl Default for Defaults {
Self { Self {
dark_mode: true, dark_mode: true,
text_color: drawing::Color::new(1.0, 1.0, 1.0, 1.0), text_color: drawing::Color::new(1.0, 1.0, 1.0, 1.0),
button_color: drawing::Color::new(1.0, 1.0, 1.0, 0.05), button_color: drawing::Color::new(1.0, 1.0, 1.0, 0.02),
accent_color: drawing::Color::new(0.13, 0.68, 1.0, 1.0), accent_color: drawing::Color::new(0.13, 0.68, 1.0, 1.0),
danger_color: drawing::Color::new(0.9, 0.0, 0.0, 1.0), danger_color: drawing::Color::new(0.9, 0.0, 0.0, 1.0),
faded_color: drawing::Color::new(0.67, 0.74, 0.80, 1.0), faded_color: drawing::Color::new(0.67, 0.74, 0.80, 1.0),