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

translations, minor refactoring, wgui: gradient intensity in globals, dash-frontend: remove unused window_list, process_list and window_options

Browse Source
This commit is contained in:
Aleksander
2026-01-15 23:18:59 +01:00
committed by galister
parent 0181119393
commit dabd122a1d
43 changed files with 191 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,8 @@ impl ComponentTrait for ComponentButton {
}
}
fn get_color2(color: &drawing::Color) -> drawing::Color {
color.lerp(&Color::new(0.0, 0.0, 0.0, color.a), 0.2)
fn get_color2(color: &drawing::Color, gradient_intensity: f32) -> drawing::Color {
color.lerp(&Color::new(0.0, 0.0, 0.0, color.a), gradient_intensity)
}
impl ComponentButton {
@@ -157,6 +157,8 @@ impl ComponentButton {
}
pub fn set_color(&self, common: &mut CallbackDataCommon, color: Color) {
let gradient_intensity = common.defaults().gradient_intensity;
let Some(mut rect) = common.state.widgets.get_as::<WidgetRectangle>(self.data.id_rect) else {
return;
};
@@ -165,7 +167,7 @@ impl ComponentButton {
state.colors.color = color;
rect.params.color = color;
rect.params.color2 = get_color2(&color);
rect.params.color2 = get_color2(&color, gradient_intensity);
}
pub fn get_time_since_last_pressed(&self) -> Duration {
@@ -191,7 +193,11 @@ impl ComponentButton {
return;
}
let anim_mult = common.state.globals.defaults().animation_mult;
let (anim_mult, gradient_intensity) = {
let defaults = common.state.globals.defaults();
(defaults.animation_mult, defaults.gradient_intensity)
};
let anim_ticks = if sticky_down { 5. } else { 10. };
let state = self.state.clone();
@@ -211,7 +217,7 @@ impl ComponentButton {
let colors = &state.colors;
let bgcolor = colors.color.lerp(&colors.hover_color, mult * 0.5);
rect.params.color = bgcolor;
rect.params.color2 = get_color2(&bgcolor);
rect.params.color2 = get_color2(&bgcolor, gradient_intensity);
rect.params.border_color = colors.border_color.lerp(&colors.hover_border_color, mult);
common.alterables.mark_redraw();
}),
@@ -222,6 +228,7 @@ impl ComponentButton {
}
fn anim_hover(
common: &mut CallbackDataCommon,
rect: &mut WidgetRectangle,
widget_data: &mut WidgetData,
colors: &Colors,
@@ -240,13 +247,15 @@ fn anim_hover(
let bgcolor = init_color.lerp(&colors.hover_color, mult);
let gradient_intensity = common.globals().defaults.gradient_intensity;
//let t = Mat4::from_scale(Vec3::splat(1.0 + pos * 0.5)) * Mat4::from_rotation_z(pos * 1.0);
let t = Mat4::from_scale(Vec3::splat(1.0 + pos * 0.05));
widget_data.transform = centered_matrix(widget_boundary.size, &t);
rect.params.color = bgcolor;
rect.params.color2 = get_color2(&bgcolor);
rect.params.color2 = get_color2(&bgcolor, gradient_intensity);
rect.params.border_color = init_border_color.lerp(&colors.hover_border_color, mult);
}
@@ -260,6 +269,7 @@ fn anim_hover_create(state: Rc<RefCell<State>>, widget_id: WidgetID, fade_in: bo
let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
let state = state.borrow();
anim_hover(
common,
rect,
anim_data.data,
&state.colors,
@@ -326,6 +336,7 @@ fn register_event_mouse_press(state: Rc<RefCell<State>>, listeners: &mut EventLi
let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
anim_hover(
common,
rect,
event_data.widget_data,
&state.colors,
@@ -373,6 +384,7 @@ fn register_event_mouse_release(
state.down = false;
if state.hovered {
anim_hover(
common,
rect,
event_data.widget_data,
&state.colors,
@@ -418,7 +430,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
let color = if let Some(color) = params.color {
color
} else {
globals.get().defaults.button_color
globals.defaults().button_color
};
let border_color = if let Some(border_color) = params.border_color {
@@ -439,11 +451,13 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
Color::new(color.r + 0.5, color.g + 0.5, color.g + 0.5, color.a + 0.5)
};
let gradient_intensity = ess.layout.state.globals.defaults().gradient_intensity;
let (root, _) = ess.layout.add_child(
ess.parent,
WidgetRectangle::create(WidgetRectangleParams {
color,
color2: get_color2(&color),
color2: get_color2(&color, gradient_intensity),
gradient: drawing::GradientMode::Vertical,
round: params.round,
border_color,
@@ -455,7 +469,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
let id_rect = root.id;
let light_text = {
let mult = if globals.get().defaults.dark_mode {
let mult = if globals.defaults().dark_mode {
color.a
} else {
1.0 - color.a

14
wgui/src/components/tabs.rs
View File

@@ -9,14 +9,10 @@ use crate::{
layout::WidgetPair,
widget::{ConstructEssentials, div::WidgetDiv},
};
use std::{
cell::RefCell,
rc::{Rc, Weak},
sync::Arc,
};
use std::{cell::RefCell, rc::Rc};
use taffy::{
AlignItems,
prelude::{auto, length, percent},
prelude::{length, percent},
};
pub struct Entry<'a> {
@@ -49,11 +45,8 @@ struct State {
on_select: Option<TabSelectCallback>,
}
struct Data {}
pub struct ComponentTabs {
base: ComponentBase,
data: Rc<Data>,
state: Rc<RefCell<State>>,
}
@@ -145,7 +138,6 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
});
}
let data = Rc::new(Data {});
let state = Rc::new(RefCell::new(State {
selected_entry_name: Rc::from(params.selected_entry_name),
mounted_entries,
@@ -169,7 +161,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
lhandles: Default::default(),
};
let tabs = Rc::new(ComponentTabs { base, data, state });
let tabs = Rc::new(ComponentTabs { base, state });
ess.layout.defer_component_refresh(Component(tabs.clone()));
Ok((root, tabs))

13
wgui/src/event.rs
View File

@@ -1,6 +1,6 @@
use std::{
any::{Any, TypeId},
cell::RefMut,
cell::{Ref, RefMut},
collections::HashSet,
};
@@ -10,6 +10,7 @@ use slotmap::{DenseSlotMap, new_key_type};
use crate::{
animation::{self, Animation},
components::Component,
globals,
i18n::I18n,
layout::{LayoutState, LayoutTask, WidgetID},
sound::WguiSoundType,
@@ -162,11 +163,19 @@ impl CallbackDataCommon<'_> {
self.state.globals.i18n()
}
// helper function
// helper functions
pub fn mark_widget_dirty(&mut self, id: WidgetID) {
self.alterables.mark_dirty(id);
self.alterables.mark_redraw();
}
pub fn globals(&self) -> RefMut<'_, globals::Globals> {
self.state.globals.get()
}
pub fn defaults(&self) -> Ref<'_, globals::Defaults> {
self.state.globals.defaults()
}
}
pub struct CallbackData<'a> {

2
wgui/src/globals.rs
View File

@@ -29,6 +29,7 @@ pub struct Defaults {
pub translucent_alpha: f32,
pub animation_mult: f32,
pub rounding_mult: f32,
pub gradient_intensity: f32, // currently used for buttons
}
impl Default for Defaults {
@@ -44,6 +45,7 @@ impl Default for Defaults {
translucent_alpha: 0.5,
animation_mult: 1.0,
rounding_mult: 1.0,
gradient_intensity: 0.3,
}
}
}

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

@@ -1,6 +1,6 @@
use crate::{
assets::AssetPath,
components::{Component, button, tooltip},
components::{Component, button},
drawing::Color,
i18n::Translation,
layout::WidgetID,
@@ -57,7 +57,7 @@ pub fn parse_component_button<'a>(
key,
value,
&mut round,
ctx.doc_params.globals.get().defaults.rounding_mult,
ctx.doc_params.globals.defaults().rounding_mult,
);
}
"color" => {

5
wgui/src/parser/component_tabs.rs
View File

@@ -1,15 +1,12 @@
use std::rc::Rc;
use crate::{
assets::AssetPath,
components::{Component, tabs},
i18n::Translation,
layout::WidgetID,
parser::{AttribPair, ParserContext, ParserFile, get_asset_path_from_kv, process_component, style::parse_style},
parser::{AttribPair, ParserContext, get_asset_path_from_kv, process_component, style::parse_style},
};
pub fn parse_component_tabs<'a>(
file: &'a ParserFile,
ctx: &mut ParserContext,
node: roxmltree::Node<'a, 'a>,
parent_id: WidgetID,

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

@@ -1054,9 +1054,7 @@ fn parse_child<'a>(
)?);
}
"Tabs" => {
new_widget_id = Some(parse_component_tabs(
file, ctx, child_node, parent_id, &attribs, tag_name,
)?);
new_widget_id = Some(parse_component_tabs(ctx, child_node, parent_id, &attribs, tag_name)?);
}
"" => { /* ignore */ }
other_tag_name => {

2
wgui/src/parser/widget_image.rs
View File

@@ -43,7 +43,7 @@ pub fn parse_widget_image<'a>(
key,
value,
&mut params.round,
ctx.doc_params.globals.get().defaults.rounding_mult,
ctx.doc_params.globals.defaults().rounding_mult,
);
}
"border" => {

2
wgui/src/parser/widget_rectangle.rs
View File

@@ -47,7 +47,7 @@ pub fn parse_widget_rectangle<'a>(
key,
value,
&mut params.round,
ctx.doc_params.globals.get().defaults.rounding_mult,
ctx.doc_params.globals.defaults().rounding_mult,
);
}
"border" => {