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

dash-frontend: clock, wgui: refactoring, non-panicking casts

Browse Source
This commit is contained in:
Aleksander
2025-09-16 20:09:13 +02:00
parent 129785daa7
commit 0fdc0e3828
20 changed files with 287 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wlx-overlay-s/src/overlays/keyboard/builder.rs
View File

@@ -324,7 +324,7 @@ fn on_enter_anim(
10,
AnimationEasing::OutBack,
Box::new(move |common, data| {
let rect = data.obj.get_as_mut::<WidgetRectangle>();
let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
set_anim_color(&key_state, rect, data.pos);
data.data.transform = get_anim_transform(data.pos, data.widget_size);
common.alterables.mark_redraw();
@@ -342,7 +342,7 @@ fn on_leave_anim(
15,
AnimationEasing::OutQuad,
Box::new(move |common, data| {
let rect = data.obj.get_as_mut::<WidgetRectangle>();
let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
set_anim_color(&key_state, rect, 1.0 - data.pos);
data.data.transform = get_anim_transform(1.0 - data.pos, data.widget_size);
common.alterables.mark_redraw();
@@ -358,7 +358,7 @@ fn on_press_anim(
if key_state.drawn_state.get() {
return;
}
let rect = data.obj.get_as_mut::<WidgetRectangle>();
let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
rect.params.border_color = Color::new(1.0, 1.0, 1.0, 1.0);
common.alterables.mark_redraw();
key_state.drawn_state.set(true);
@@ -372,7 +372,7 @@ fn on_release_anim(
if !key_state.drawn_state.get() {
return;
}
let rect = data.obj.get_as_mut::<WidgetRectangle>();
let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
rect.params.border_color = key_state.border_color;
common.alterables.mark_redraw();
key_state.drawn_state.set(false);

12
wlx-overlay-s/src/overlays/watch.rs
View File

@@ -55,9 +55,9 @@ where
if let Some(s) =
tz_str.and_then(|tz| tz.split('/').next_back().map(|x| x.replace('_', " ")))
{
label.set_text(&mut i18n, Translation::from_raw_text(&s));
label.set_text_simple(&mut i18n, Translation::from_raw_text(&s));
} else {
label.set_text(&mut i18n, Translation::from_raw_text("Local"));
label.set_text_simple(&mut i18n, Translation::from_raw_text("Local"));
}
continue;
@@ -73,7 +73,7 @@ where
}
_ => {
let mut i18n = panel.layout.state.globals.i18n();
label.set_text(&mut i18n, Translation::from_raw_text("ERR"));
label.set_text_simple(&mut i18n, Translation::from_raw_text("ERR"));
continue;
}
};
@@ -158,7 +158,7 @@ struct ClockState {
fn clock_on_tick(
clock: &ClockState,
common: &event::CallbackDataCommon,
common: &mut event::CallbackDataCommon,
data: &mut event::CallbackData,
) {
let date_time = clock.timezone.as_ref().map_or_else(
@@ -166,6 +166,6 @@ fn clock_on_tick(
|tz| format!("{}", Local::now().with_timezone(tz).format(&clock.format)),
);
let label = data.obj.get_as_mut::<WidgetLabel>();
label.set_text(&mut common.i18n(), Translation::from_raw_text(&date_time));
let label = data.obj.get_as_mut::<WidgetLabel>().unwrap();
label.set_text(common, Translation::from_raw_text(&date_time));
}