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

fix build

Browse Source
This commit is contained in:
galister
2025-10-05 19:38:29 +09:00
parent aa64310d96
commit 71d7d50e35
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wgui/src/layout.rs
View File

@@ -1,21 +1,19 @@
use std::{ use std::{
cell::{RefCell, RefMut}, cell::{RefCell, RefMut},
collections::VecDeque,
rc::{Rc, Weak}, rc::{Rc, Weak},
}; };
use crate::{ use crate::{
animation::Animations, animation::Animations,
components::{Component, InitData}, components::{Component, InitData},
drawing::{self, Boundary, has_overflow_clip, push_scissor_stack, push_transform_stack}, drawing::{push_scissor_stack, push_transform_stack, Boundary},
event::{self, CallbackDataCommon, EventAlterables, EventListenerCollection}, event::{self, CallbackDataCommon, EventAlterables, EventListenerCollection},
globals::WguiGlobals, globals::WguiGlobals,
stack::{self, ScissorBoundary}, widget::{self, div::WidgetDiv, EventParams, WidgetObj, WidgetState},
widget::{self, EventParams, WidgetObj, WidgetState, div::WidgetDiv},
}; };
use glam::{Vec2, vec2}; use glam::{vec2, Vec2};
use slotmap::{HopSlotMap, SecondaryMap, new_key_type}; use slotmap::{new_key_type, HopSlotMap, SecondaryMap};
use taffy::{NodeId, TaffyTree, TraversePartialTree}; use taffy::{NodeId, TaffyTree, TraversePartialTree};
new_key_type! { new_key_type! {

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

@@ -1,7 +1,7 @@
use std::{cell::RefCell, rc::Rc, sync::Arc}; use std::{cell::RefCell, rc::Rc, sync::Arc};
use button::setup_custom_button; use button::setup_custom_button;
use glam::{Affine2, Vec2, vec2}; use glam::{vec2, Affine2, Vec2};
use label::setup_custom_label; use label::setup_custom_label;
use vulkano::{command_buffer::CommandBufferUsage, image::view::ImageView}; use vulkano::{command_buffer::CommandBufferUsage, image::view::ImageView};
use wgui::{ use wgui::{
@@ -21,7 +21,7 @@ use crate::{
backend::input::{Haptics, PointerHit, PointerMode}, backend::input::{Haptics, PointerHit, PointerMode},
graphics::{CommandBuffers, ExtentExt}, graphics::{CommandBuffers, ExtentExt},
state::AppState, state::AppState,
windowing::backend::{FrameMeta, OverlayBackend, ShouldRender, ui_transform}, windowing::backend::{ui_transform, FrameMeta, OverlayBackend, ShouldRender},
}; };
use super::{timer::GuiTimer, timestep::Timestep}; use super::{timer::GuiTimer, timestep::Timestep};
@@ -230,7 +230,7 @@ impl<S> OverlayBackend for GuiPanel<S> {
app: &mut AppState, app: &mut AppState,
tgt: Arc<ImageView>, tgt: Arc<ImageView>,
buf: &mut CommandBuffers, buf: &mut CommandBuffers,
_alpha: f32, alpha: f32,
) -> anyhow::Result<bool> { ) -> anyhow::Result<bool> {
self.context self.context
.update_viewport(&mut app.wgui_shared, tgt.extent_u32arr(), 1.0)?; .update_viewport(&mut app.wgui_shared, tgt.extent_u32arr(), 1.0)?;
@@ -246,9 +246,10 @@ impl<S> OverlayBackend for GuiPanel<S> {
wgui::gfx::cmd::WGfxClearMode::Clear([0.0, 0.0, 0.0, 0.0]), wgui::gfx::cmd::WGfxClearMode::Clear([0.0, 0.0, 0.0, 0.0]),
)?; )?;
let primitives = wgui::drawing::draw(&wgui::drawing::DrawParams { let primitives = wgui::drawing::draw(&mut wgui::drawing::DrawParams {
layout: &self.layout, layout: &mut self.layout,
debug_draw: false, debug_draw: false,
alpha,
})?; })?;
self.context self.context
.draw(&mut app.wgui_shared, &mut cmd_buf, &primitives)?; .draw(&mut app.wgui_shared, &mut cmd_buf, &primitives)?;