diff --git a/wgui/src/layout.rs b/wgui/src/layout.rs index fa041db..4b89be9 100644 --- a/wgui/src/layout.rs +++ b/wgui/src/layout.rs @@ -1,21 +1,19 @@ use std::{ cell::{RefCell, RefMut}, - collections::VecDeque, rc::{Rc, Weak}, }; use crate::{ animation::Animations, 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}, globals::WguiGlobals, - stack::{self, ScissorBoundary}, - widget::{self, EventParams, WidgetObj, WidgetState, div::WidgetDiv}, + widget::{self, div::WidgetDiv, EventParams, WidgetObj, WidgetState}, }; -use glam::{Vec2, vec2}; -use slotmap::{HopSlotMap, SecondaryMap, new_key_type}; +use glam::{vec2, Vec2}; +use slotmap::{new_key_type, HopSlotMap, SecondaryMap}; use taffy::{NodeId, TaffyTree, TraversePartialTree}; new_key_type! { diff --git a/wlx-overlay-s/src/gui/panel/mod.rs b/wlx-overlay-s/src/gui/panel/mod.rs index ce5718f..8229939 100644 --- a/wlx-overlay-s/src/gui/panel/mod.rs +++ b/wlx-overlay-s/src/gui/panel/mod.rs @@ -1,7 +1,7 @@ use std::{cell::RefCell, rc::Rc, sync::Arc}; use button::setup_custom_button; -use glam::{Affine2, Vec2, vec2}; +use glam::{vec2, Affine2, Vec2}; use label::setup_custom_label; use vulkano::{command_buffer::CommandBufferUsage, image::view::ImageView}; use wgui::{ @@ -21,7 +21,7 @@ use crate::{ backend::input::{Haptics, PointerHit, PointerMode}, graphics::{CommandBuffers, ExtentExt}, state::AppState, - windowing::backend::{FrameMeta, OverlayBackend, ShouldRender, ui_transform}, + windowing::backend::{ui_transform, FrameMeta, OverlayBackend, ShouldRender}, }; use super::{timer::GuiTimer, timestep::Timestep}; @@ -230,7 +230,7 @@ impl OverlayBackend for GuiPanel { app: &mut AppState, tgt: Arc, buf: &mut CommandBuffers, - _alpha: f32, + alpha: f32, ) -> anyhow::Result { self.context .update_viewport(&mut app.wgui_shared, tgt.extent_u32arr(), 1.0)?; @@ -246,9 +246,10 @@ impl OverlayBackend for GuiPanel { wgui::gfx::cmd::WGfxClearMode::Clear([0.0, 0.0, 0.0, 0.0]), )?; - let primitives = wgui::drawing::draw(&wgui::drawing::DrawParams { - layout: &self.layout, + let primitives = wgui::drawing::draw(&mut wgui::drawing::DrawParams { + layout: &mut self.layout, debug_draw: false, + alpha, })?; self.context .draw(&mut app.wgui_shared, &mut cmd_buf, &primitives)?;