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

update decor.xml, fix max_size

Browse Source
This commit is contained in:
Aleksander
2026-01-03 19:29:01 +01:00
parent 6d7386f73d
commit f5dc5449ad
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wlx-overlay-s/src/assets/gui/decor.xml
View File

@@ -1,23 +1,31 @@
<layout> <layout>
<macro name="window_button" padding="4" align_items="center" />
<elements> <elements>
<div flex_grow="1" height="48">
<rectangle <rectangle
width="100%" height="100%" flex_grow="1" height="48"
margin="4" box_sizing="border_box" padding="8" border="2"
border_color="~color_faded" border="2" round="8"
round="50%" color="~color_faded" align_items="center"
justify_content="space_between"> justify_content="space_between"
color="~color_background"
<label id="label_title" color="~color_text" size="18" text="Test" weight="bold" /> border_color="~color_accent"
>
<label id="label_title" margin_left="8" color="~color_text" size="22" weight="bold" />
<Button macro="button_style" tooltip="WATCH.EDIT_MODE" _press="" border_color="~color_faded_translucent" color="~color_faded_50" color2="~color_faded_10"> <div gap="4">
<sprite width="24" height="24" src="watch/edit.svg" /> <Button macro="window_button" tooltip="WATCH.EDIT_MODE" _press=""
border_color="~color_faded_translucent" color="~color_faded_50" color2="~color_faded_10">
<sprite width="28" height="28" src="watch/edit.svg" />
</Button> </Button>
<Button macro="button_style" tooltip="DECOR.CLOSE_WINDOW" _long_release="" border_color="~color_danger_translucent" color="~color_danger_50" color2="~color_danger_10"> <Button macro="window_button" tooltip="DECOR.CLOSE_WINDOW" _long_release=""
<sprite width="24" height="24" src="edit/close.svg" /> border_color="~color_danger_translucent" color="~color_danger_50" color2="~color_danger_10">
<sprite width="28" height="28" src="edit/close.svg" />
</Button> </Button>
</div>
</rectangle> </rectangle>
</div>
</elements> </elements>
</layout> </layout>

10
wlx-overlay-s/src/overlays/wayvr.rs
View File

@@ -43,7 +43,7 @@ use crate::{
}; };
const BORDER_SIZE: u32 = 5; const BORDER_SIZE: u32 = 5;
const BAR_SIZE: u32 = 40; const BAR_SIZE: u32 = 48;
pub fn create_wl_window_overlay( pub fn create_wl_window_overlay(
name: Arc<str>, name: Arc<str>,
@@ -117,7 +117,7 @@ impl WvrWindowBackend {
.fetch_widget_as::<WidgetLabel>(&panel.layout.state, "label_title")?; .fetch_widget_as::<WidgetLabel>(&panel.layout.state, "label_title")?;
title.set_text_simple( title.set_text_simple(
&mut app.wgui_globals.get(), &mut app.wgui_globals.get(),
Translation::from_raw_text(&*name), Translation::from_raw_text(&name),
); );
} }
@@ -162,7 +162,10 @@ impl WvrWindowBackend {
self.mouse_transform = Affine2::from_scale_angle_translation(scale, 0.0, translation); self.mouse_transform = Affine2::from_scale_angle_translation(scale, 0.0, translation);
self.uv_range = translation[0]..=(1.0 - translation[0]); self.uv_range = translation[0]..=(1.0 - translation[0]);
self.panel.max_size = vec2((meta.extent[0] + BORDER_SIZE * 2) as _, BAR_SIZE as _); self.panel.max_size = vec2(
(meta.extent[0]/* + BORDER_SIZE * 2 (disabled for now) */) as _,
BAR_SIZE as _,
);
self.panel.update_layout(app)?; self.panel.update_layout(app)?;
Ok(()) Ok(())
@@ -183,6 +186,7 @@ impl OverlayBackend for WvrWindowBackend {
self.panel.resume(app) self.panel.resume(app)
} }
#[allow(clippy::too_many_lines)]
fn should_render(&mut self, app: &mut AppState) -> anyhow::Result<ShouldRender> { fn should_render(&mut self, app: &mut AppState) -> anyhow::Result<ShouldRender> {
let should_render_panel = self.panel.should_render(app)?; let should_render_panel = self.panel.should_render(app)?;