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

edit: dynamic gui scale

Browse Source
This commit is contained in:
Aleksander
2025-11-12 19:57:38 +01:00
parent 6e11c2cf87
commit 3aee4d68a3
8 changed files with 112 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
wlx-overlay-s/src/gui/panel/mod.rs
View File

@@ -1,7 +1,7 @@
use std::{cell::RefCell, rc::Rc};
use button::setup_custom_button;
use glam::{vec2, Affine2, Vec2};
use glam::{Affine2, Vec2, vec2};
use label::setup_custom_label;
use wgui::{
assets::AssetPath,
@@ -15,14 +15,14 @@ use wgui::{
layout::{Layout, LayoutParams, WidgetID},
parser::ParserState,
renderer_vk::context::Context as WguiContext,
widget::{label::WidgetLabel, rectangle::WidgetRectangle, EventResult},
widget::{EventResult, label::WidgetLabel, rectangle::WidgetRectangle},
};
use crate::{
backend::input::{Haptics, HoverResult, PointerHit, PointerMode},
state::AppState,
subsystem::hid::WheelDelta,
windowing::backend::{ui_transform, FrameMeta, OverlayBackend, RenderResources, ShouldRender},
windowing::backend::{FrameMeta, OverlayBackend, RenderResources, ShouldRender, ui_transform},
};
use super::{timer::GuiTimer, timestep::Timestep};
@@ -41,6 +41,7 @@ pub struct GuiPanel<S> {
pub timers: Vec<GuiTimer>,
pub parser_state: ParserState,
pub max_size: Vec2,
pub gui_scale: f32,
interaction_transform: Option<Affine2>,
context: WguiContext,
timestep: Timestep,
@@ -56,13 +57,28 @@ pub type OnCustomIdFunc = Box<
) -> anyhow::Result<()>,
>;
pub struct NewGuiPanelParams {
pub on_custom_id: Option<OnCustomIdFunc>, // used only in `new_from_template`
pub resize_to_parent: bool,
pub gui_scale: f32,
}
impl Default for NewGuiPanelParams {
fn default() -> Self {
Self {
on_custom_id: None,
resize_to_parent: false,
gui_scale: 1.0,
}
}
}
impl<S: 'static> GuiPanel<S> {
pub fn new_from_template(
app: &mut AppState,
path: &str,
state: S,
on_custom_id: Option<OnCustomIdFunc>,
resize_to_parent: bool,
params: NewGuiPanelParams,
) -> anyhow::Result<Self> {
let custom_elems = Rc::new(RefCell::new(vec![]));
@@ -80,10 +96,14 @@ impl<S: 'static> GuiPanel<S> {
},
};
let (mut layout, mut parser_state) =
wgui::parser::new_layout_from_assets(&doc_params, &LayoutParams { resize_to_parent })?;
let (mut layout, mut parser_state) = wgui::parser::new_layout_from_assets(
&doc_params,
&LayoutParams {
resize_to_parent: params.resize_to_parent,
},
)?;
if let Some(on_element_id) = on_custom_id {
if let Some(on_element_id) = params.on_custom_id {
let ids = parser_state.data.ids.clone(); // FIXME: copying all ids?
for (id, widget) in ids {
@@ -128,11 +148,21 @@ impl<S: 'static> GuiPanel<S> {
max_size: vec2(DEFAULT_MAX_SIZE as _, DEFAULT_MAX_SIZE as _),
timers: vec![],
interaction_transform: None,
gui_scale: params.gui_scale,
})
}
pub fn new_blank(app: &mut AppState, state: S, resize_to_parent: bool) -> anyhow::Result<Self> {
let layout = Layout::new(app.wgui_globals.clone(), &LayoutParams { resize_to_parent })?;
pub fn new_blank(
app: &mut AppState,
state: S,
params: NewGuiPanelParams,
) -> anyhow::Result<Self> {
let layout = Layout::new(
app.wgui_globals.clone(),
&LayoutParams {
resize_to_parent: params.resize_to_parent,
},
)?;
let context = WguiContext::new(&mut app.wgui_shared, 1.0)?;
let mut timestep = Timestep::new();
timestep.set_tps(60.0);
@@ -146,6 +176,7 @@ impl<S: 'static> GuiPanel<S> {
max_size: vec2(DEFAULT_MAX_SIZE as _, DEFAULT_MAX_SIZE as _),
timers: vec![],
interaction_transform: None,
gui_scale: params.gui_scale,
})
}
@@ -222,8 +253,9 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
fn render(&mut self, app: &mut AppState, rdr: &mut RenderResources) -> anyhow::Result<()> {
self.context
.update_viewport(&mut app.wgui_shared, rdr.extent, 1.0)?;
self.layout.update(self.max_size, self.timestep.alpha)?;
.update_viewport(&mut app.wgui_shared, rdr.extent, self.gui_scale)?;
self.layout
.update(self.max_size / self.gui_scale, self.timestep.alpha)?;
let globals = self.layout.state.globals.clone(); // sorry
let mut globals = globals.get();

4
wlx-overlay-s/src/overlays/anchor.rs
View File

@@ -3,13 +3,13 @@ use std::sync::{Arc, LazyLock};
use crate::gui::panel::GuiPanel;
use crate::state::AppState;
use crate::windowing::window::{OverlayWindowConfig, OverlayWindowState, Positioning};
use crate::windowing::Z_ORDER_ANCHOR;
use crate::windowing::window::{OverlayWindowConfig, OverlayWindowState, Positioning};
pub static ANCHOR_NAME: LazyLock<Arc<str>> = LazyLock::new(|| Arc::from("anchor"));
pub fn create_anchor(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
let mut panel = GuiPanel::new_from_template(app, "gui/anchor.xml", (), None, false)?;
let mut panel = GuiPanel::new_from_template(app, "gui/anchor.xml", (), Default::default())?;
panel.update_layout()?;
Ok(OverlayWindowConfig {

2
wlx-overlay-s/src/overlays/bar.rs
View File

@@ -15,7 +15,7 @@ struct BarState {}
#[allow(clippy::match_same_arms)] // TODO: remove later
pub fn create_bar(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
let state = BarState {};
let mut panel = GuiPanel::new_from_template(app, "gui/bar.xml", state, None, false)?;
let mut panel = GuiPanel::new_from_template(app, "gui/bar.xml", state, Default::default())?;
for (id, _widget_id) in &panel.parser_state.data.ids {
match id.as_ref() {

4
wlx-overlay-s/src/overlays/custom.rs
View File

@@ -1,6 +1,6 @@
use std::sync::Arc;
use glam::{vec3, Affine3A, Quat, Vec3};
use glam::{Affine3A, Quat, Vec3, vec3};
use crate::{
gui::panel::GuiPanel,
@@ -18,7 +18,7 @@ pub fn create_custom(app: &mut AppState, name: Arc<str>) -> Option<OverlayWindow
unreachable!();
let panel = GuiPanel::new_blank(app, (), false).ok()?;
let panel = GuiPanel::new_blank(app, (), Default::default()).ok()?;
panel.update_layout().ok()?;
Some(OverlayWindowConfig {

42
wlx-overlay-s/src/overlays/edit.rs
View File

@@ -4,11 +4,11 @@ use std::{
sync::Arc,
};
use glam::vec2;
use glam::{UVec2, vec2};
use crate::{
backend::input::HoverResult,
gui::panel::GuiPanel,
gui::panel::{GuiPanel, NewGuiPanelParams},
state::AppState,
subsystem::hid::WheelDelta,
windowing::{
@@ -35,11 +35,19 @@ impl EditWrapperManager {
return Ok(());
}
let Some(meta) = owc.backend.frame_meta() else {
log::error!("META NULL");
return Ok(());
};
log::debug!("EditMode wrap on {}", owc.name);
let inner = mem::replace(&mut owc.backend, Box::new(DummyBackend {}));
let mut panel = self.panel_pool.pop();
if panel.is_none() {
panel = Some(make_edit_panel(app)?);
panel = Some(make_edit_panel(
app,
UVec2::new(meta.extent[0], meta.extent[1]),
)?);
}
let mut panel = panel.unwrap();
panel.state = owc.name.clone();
@@ -99,10 +107,15 @@ impl OverlayBackend for EditModeBackendWrapper {
if !matches!(i, ShouldRender::Unable)
&& let Some(ref frame_meta) = self.inner.frame_meta()
{
let new_size = vec2(frame_meta.extent[0] as _, frame_meta.extent[1] as _);
let (width_px, height_px) = (frame_meta.extent[0], frame_meta.extent[1]);
let new_size = vec2(width_px as _, height_px as _);
if self.panel.max_size != new_size {
log::debug!("EditWrapperGui size {} → {new_size}", self.panel.max_size);
self.panel.max_size = new_size;
let gui_scale = width_px.min(height_px) as f32 / 550.0;
self.panel.gui_scale = gui_scale;
self.panel.update_layout()?;
}
} else {
@@ -165,8 +178,25 @@ impl OverlayBackend for EditModeBackendWrapper {
}
}
fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
let panel = GuiPanel::new_from_template(app, "gui/edit.xml", "".into(), None, true)?;
fn make_edit_panel(
app: &mut AppState,
overlay_resolution: UVec2,
) -> anyhow::Result<EditModeWrapPanel> {
log::error!(
"overlay res {} {}",
overlay_resolution.x,
overlay_resolution.y
);
let panel = GuiPanel::new_from_template(
app,
"gui/edit.xml",
"".into(),
NewGuiPanelParams {
resize_to_parent: true,
..Default::default()
},
)?;
Ok(panel)
}

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

@@ -53,7 +53,7 @@ pub fn create_keyboard(
processes: vec![],
};
let mut panel = GuiPanel::new_blank(app, state, false)?;
let mut panel = GuiPanel::new_blank(app, state, Default::default())?;
let globals = app.wgui_globals.clone();
let accent_color = globals.get().defaults.accent_color;

6
wlx-overlay-s/src/overlays/toast.rs
View File

@@ -5,7 +5,7 @@ use std::{
time::Instant,
};
use glam::{vec3, Affine3A, Quat, Vec3};
use glam::{Affine3A, Quat, Vec3, vec3};
use idmap_derive::IntegerId;
use serde::{Deserialize, Serialize};
use wgui::{
@@ -28,8 +28,8 @@ use crate::{
gui::panel::GuiPanel,
state::{AppState, LeftRight},
windowing::{
window::{OverlayWindowConfig, OverlayWindowState, Positioning},
OverlaySelector, Z_ORDER_TOAST,
window::{OverlayWindowConfig, OverlayWindowState, Positioning},
},
};
@@ -170,7 +170,7 @@ fn new_toast(toast: Toast, app: &mut AppState) -> Option<OverlayWindowConfig> {
toast.title
};
let mut panel = GuiPanel::new_blank(app, (), false).ok()?;
let mut panel = GuiPanel::new_blank(app, (), Default::default()).ok()?;
let globals = panel.layout.state.globals.clone();

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

@@ -3,11 +3,14 @@ use std::{collections::HashMap, rc::Rc, time::Duration};
use glam::{Affine3A, Vec3, Vec3A};
use crate::{
gui::{panel::GuiPanel, timer::GuiTimer},
gui::{
panel::{GuiPanel, NewGuiPanelParams},
timer::GuiTimer,
},
state::AppState,
windowing::{
window::{OverlayWindowConfig, OverlayWindowData, OverlayWindowState, Positioning},
Z_ORDER_WATCH,
window::{OverlayWindowConfig, OverlayWindowData, OverlayWindowState, Positioning},
},
};
@@ -22,22 +25,25 @@ pub fn create_watch(app: &mut AppState, num_sets: usize) -> anyhow::Result<Overl
app,
"gui/watch.xml",
state,
Some(Box::new(
move |id, widget, doc_params, layout, parser_state| {
if &*id != "sets" {
return Ok(());
}
NewGuiPanelParams {
on_custom_id: Some(Box::new(
move |id, widget, doc_params, layout, parser_state| {
if &*id != "sets" {
return Ok(());
}
for idx in 0..num_sets {
let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
params.insert("display".into(), (idx + 1).to_string().into());
params.insert("handle".into(), idx.to_string().into());
parser_state.instantiate_template(doc_params, "Set", layout, widget, params)?;
}
Ok(())
},
)),
false,
for idx in 0..num_sets {
let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
params.insert("display".into(), (idx + 1).to_string().into());
params.insert("handle".into(), idx.to_string().into());
parser_state
.instantiate_template(doc_params, "Set", layout, widget, params)?;
}
Ok(())
},
)),
..Default::default()
},
)?;
panel