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

notifications

Browse Source
This commit is contained in:
galister
2024-02-21 19:52:42 +01:00
parent 39cc22474b
commit e7710b56d9
18 changed files with 381 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/overlays/toast.rs
View File

@@ -1,11 +1,31 @@
use std::sync::Arc;
use std::{
ops::Add,
sync::{atomic::AtomicUsize, Arc},
};
use glam::vec3a;
use crate::{
backend::{
common::{OverlaySelector, TaskType},
overlay::{OverlayBackend, OverlayState, RelativeTo},
},
gui::{color_parse, CanvasBuilder},
state::AppState,
};
const FONT_SIZE: isize = 16;
const PADDING: (f32, f32) = (25., 7.);
const PIXELS_TO_METERS: f32 = 1. / 2000.;
static AUTO_INCREMENT: AtomicUsize = AtomicUsize::new(0);
pub struct Toast {
pub title: Arc<str>,
pub body: Arc<str>,
pub opacity: f32,
pub volume: f32,
pub timeout: f32,
pub sound: bool,
}
#[allow(dead_code)]
@@ -16,7 +36,7 @@ impl Toast {
body,
opacity: 1.0,
timeout: 3.0,
sound: false,
volume: 0.0,
}
}
pub fn with_timeout(mut self, timeout: f32) -> Self {
@@ -27,8 +47,94 @@ impl Toast {
self.opacity = opacity;
self
}
pub fn with_sound(mut self) -> Self {
self.sound = true;
pub fn with_volume(mut self, volume: f32) -> Self {
self.volume = volume;
self
}
pub fn submit(self, app: &mut AppState) {
let auto_increment = AUTO_INCREMENT.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
let name: Arc<str> = format!("toast-{}", auto_increment).into();
let selector = OverlaySelector::Name(name.clone());
let destroy_at =
std::time::Instant::now().add(std::time::Duration::from_secs_f32(self.timeout));
app.tasks.enqueue(TaskType::CreateOverlay(
selector.clone(),
Box::new(move |app| new_toast(self, name, app)),
));
app.tasks
.enqueue_at(TaskType::DropOverlay(selector), destroy_at);
}
}
fn new_toast(
toast: Toast,
name: Arc<str>,
app: &mut AppState,
) -> Option<(OverlayState, Box<dyn OverlayBackend>)> {
let title = if toast.title.len() > 0 {
toast.title
} else {
"Notification".into()
};
let mut size = if toast.body.len() > 0 {
let (w0, _) = app
.fc
.get_text_size(&title, FONT_SIZE, app.graphics.clone())
.ok()?;
let (w1, h1) = app
.fc
.get_text_size(&toast.body, FONT_SIZE, app.graphics.clone())
.ok()?;
(w0.max(w1), h1 + 50.)
} else {
app.fc
.get_text_size(&title, FONT_SIZE, app.graphics.clone())
.ok()?
};
let og_width = size.0;
size.0 += PADDING.0 * 2.;
let mut canvas = CanvasBuilder::<(), ()>::new(
size.0 as _,
size.1 as _,
app.graphics.clone(),
app.graphics.native_format,
(),
)
.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);
if toast.body.len() > 0 {
log::info!("{}: {}", title, toast.body);
canvas.label(PADDING.0, 54., og_width, size.1 - 54., 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.);
canvas.label_centered(PADDING.0, 16., og_width, FONT_SIZE as f32 + 2., title);
} else {
log::info!("Toast: {}", title);
canvas.label(0., 0., size.0, size.1, title);
}
let state = OverlayState {
name,
want_visible: true,
spawn_scale: size.0 * PIXELS_TO_METERS,
spawn_point: vec3a(0., -0.2, -0.5),
relative_to: RelativeTo::Head,
..Default::default()
};
let backend = Box::new(canvas.build());
Some((state, backend))
}

34
src/overlays/watch.rs
View File

@@ -284,7 +284,7 @@ where
canvas.font_size = font_size;
let button = canvas.button(x, y, w, h, text.clone());
button.state = Some(ElemState::Mirror { name, show_hide });
button.on_press = Some(btn_mirror_dn::<O>);
button.on_press = Some(btn_mirror_dn);
button.on_scroll = Some(overlay_button_scroll);
}
}
@@ -346,14 +346,12 @@ enum ElemState {
}
#[cfg(feature = "wayland")]
fn btn_mirror_dn<O>(
fn btn_mirror_dn(
control: &mut Control<(), ElemState>,
_: &mut (),
app: &mut AppState,
mode: PointerMode,
) where
O: Default,
{
) {
let ElemState::Mirror { name, show_hide } = control.state.as_ref().unwrap()
// want panic
else {
@@ -428,10 +426,12 @@ fn btn_func_dn(
Box::new(|app, o| {
o.want_visible = false;
o.spawn_scale = 0.0;
app.tasks.enqueue(TaskType::Toast(Toast::new(
Toast::new(
"Watch hidden".into(),
"Use show/hide button to restore.".into(),
)))
)
.with_timeout(3.)
.submit(app);
}),
));
}
@@ -441,7 +441,6 @@ fn btn_func_dn(
Box::new(|app, o| {
if let RelativeTo::Hand(0) = o.relative_to {
o.relative_to = RelativeTo::Hand(1);
o.spawn_rotation = app.session.watch_rot;
o.spawn_rotation = app.session.watch_rot
* Quat::from_rotation_x(PI)
* Quat::from_rotation_z(PI);
@@ -452,10 +451,9 @@ fn btn_func_dn(
o.spawn_rotation = app.session.watch_rot;
o.spawn_point = app.session.watch_pos.into();
}
app.tasks.enqueue(TaskType::Toast(Toast::new(
"Watch switched".into(),
"Check your other hand".into(),
)))
Toast::new("Watch switched".into(), "Check your other hand".into())
.with_timeout(3.)
.submit(app);
}),
));
}
@@ -571,7 +569,7 @@ fn exec_label_update(control: &mut Control<(), ElemState>, _: &mut (), _: &mut A
} else {
if let Some(mut stdout) = proc.stdout.take() {
let mut buf = String::new();
if let Ok(_) = stdout.read_to_string(&mut buf) {
if stdout.read_to_string(&mut buf).is_ok() {
control.set_text(&buf);
} else {
log::error!("Failed to read stdout for child process");
@@ -730,10 +728,11 @@ fn overlay_button_up(control: &mut Control<(), ElemState>, _: &mut (), app: &mut
o.grabbable = o.recenter;
o.show_hide = o.recenter;
if !o.recenter {
app.tasks.enqueue(TaskType::Toast(Toast::new(
Toast::new(
format!("{} is now locked in place!", o.name).into(),
"Right-click again to toggle.".into(),
)))
)
.submit(app);
}
}),
));
@@ -744,10 +743,11 @@ fn overlay_button_up(control: &mut Control<(), ElemState>, _: &mut (), app: &mut
Box::new(|app, o| {
o.interactable = !o.interactable;
if !o.interactable {
app.tasks.enqueue(TaskType::Toast(Toast::new(
Toast::new(
format!("{} is now non-interactable!", o.name).into(),
"Middle-click again to toggle.".into(),
)))
)
.submit(app);
}
}),
));