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

wgui: prevent data copy, parser data

Browse Source
This commit is contained in:
Aleksander
2025-09-21 13:39:14 +02:00
parent cd18bdcea8
commit 7a97e9dee2
4 changed files with 157 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ where
let state = BarState {};
let mut panel = GuiPanel::new_from_template(app, "gui/bar.xml", state, None)?;
for (id, _widget_id) in &panel.parser_state.ids {
for (id, _widget_id) in &panel.parser_state.data.ids {
match id.as_ref() {
"lock" => {}
"anchor" => {}

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

@@ -172,13 +172,13 @@ where
params,
)?;
if let Some(widget_id) = gui_state_key.ids.get(&*my_id) {
if let Some(widget_id) = gui_state_key.get_widget_id(&*my_id).ok() {
let key_state = {
let rect = panel
.layout
.state
.widgets
.get_as::<WidgetRectangle>(*widget_id)
.get_as::<WidgetRectangle>(widget_id)
.unwrap(); // want panic
Rc::new(KeyState {
@@ -192,7 +192,7 @@ where
panel.listeners.register(
&mut panel.listener_handles,
*widget_id,
widget_id,
EventListenerKind::MouseEnter,
Box::new({
let k = key_state.clone();
@@ -205,7 +205,7 @@ where
);
panel.listeners.register(
&mut panel.listener_handles,
*widget_id,
widget_id,
EventListenerKind::MouseLeave,
Box::new({
let k = key_state.clone();
@@ -218,7 +218,7 @@ where
);
panel.listeners.register(
&mut panel.listener_handles,
*widget_id,
widget_id,
EventListenerKind::MousePress,
Box::new({
let k = key_state.clone();
@@ -235,7 +235,7 @@ where
);
panel.listeners.register(
&mut panel.listener_handles,
*widget_id,
widget_id,
EventListenerKind::MouseRelease,
Box::new({
let k = key_state.clone();
@@ -251,7 +251,7 @@ where
if let Some(modifier) = my_modifier {
panel.listeners.register(
&mut panel.listener_handles,
*widget_id,
widget_id,
EventListenerKind::InternalStateChange,
Box::new({
let k = key_state.clone();