From 4d4292255a643714ede9bce57a522e6acdfb4e27 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Thu, 13 Nov 2025 20:23:27 +0100 Subject: [PATCH] rename to `timestep_alpha` --- uidev/src/main.rs | 2 +- wgui/src/drawing.rs | 10 +++++----- wlx-overlay-s/src/gui/panel/mod.rs | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/uidev/src/main.rs b/uidev/src/main.rs index 6292c82..67d43f4 100644 --- a/uidev/src/main.rs +++ b/uidev/src/main.rs @@ -344,7 +344,7 @@ fn main() -> Result<(), Box> { globals: &mut globals, layout: &mut layout, debug_draw: debug_draw_enabled, - alpha: timestep.alpha, + timestep_alpha: timestep.alpha, }; let primitives = wgui::drawing::draw(&mut draw_params).unwrap(); diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs index 077d749..db3dcda 100644 --- a/wgui/src/drawing.rs +++ b/wgui/src/drawing.rs @@ -9,7 +9,7 @@ use crate::{ event::EventAlterables, globals::Globals, layout::Widget, - renderer_vk::text::{custom_glyph::CustomGlyph, TextShadow}, + renderer_vk::text::{TextShadow, custom_glyph::CustomGlyph}, stack::{self, ScissorBoundary, ScissorStack, TransformStack}, widget::{self, ScrollbarInfo, WidgetState}, }; @@ -173,7 +173,7 @@ pub struct DrawParams<'a> { pub globals: &'a Globals, pub layout: &'a mut Layout, pub debug_draw: bool, - pub alpha: f32, // timestep alpha, 0.0 - 1.0, used for motion interpolation if rendering above tick rate: smoother animations or scrolling + pub timestep_alpha: f32, // timestep alpha, 0.0 - 1.0, used for motion interpolation if rendering above tick rate: smoother animations or scrolling } pub fn has_overflow_clip(style: &taffy::Style) -> bool { @@ -250,7 +250,7 @@ fn draw_widget( let (scroll_shift, wants_redraw, info) = match widget::get_scrollbar_info(l) { Some(info) => { - let (scrolling, wants_redraw) = widget_state.get_scroll_shift_smooth(&info, l, params.alpha); + let (scrolling, wants_redraw) = widget_state.get_scroll_shift_smooth(&info, l, params.timestep_alpha); (scrolling, wants_redraw, Some(info)) } None => (Vec2::default(), false, None), @@ -264,7 +264,7 @@ fn draw_widget( state.primitives.push(primitive_debug_rect( &boundary, &state.transform_stack.get().transform, - Color::new(0.0, 1.0, 1.0, 0.5 * params.alpha), + Color::new(0.0, 1.0, 1.0, 0.5), )); } @@ -277,7 +277,7 @@ fn draw_widget( state.primitives.push(primitive_debug_rect( &boundary_relative, &state.transform_stack.get().transform, - Color::new(1.0, 0.0, 1.0, params.alpha), + Color::new(1.0, 0.0, 1.0, 1.0), )); } diff --git a/wlx-overlay-s/src/gui/panel/mod.rs b/wlx-overlay-s/src/gui/panel/mod.rs index 526c8b9..9f901cb 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}; use button::setup_custom_button; -use glam::{vec2, Affine2, Vec2}; +use glam::{Affine2, Vec2, vec2}; use label::setup_custom_label; use wgui::{ assets::AssetPath, @@ -16,14 +16,14 @@ use wgui::{ layout::{Layout, LayoutParams, WidgetID}, parser::{CustomAttribsInfoOwned, 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}; @@ -289,7 +289,7 @@ impl OverlayBackend for GuiPanel { globals: &mut globals, layout: &mut self.layout, debug_draw: false, - alpha: self.timestep.alpha, + timestep_alpha: self.timestep.alpha, })?; self.context.draw( &globals.font_system,