From e6e1764b36dbce9eda55bfd8a60802f0d8d11a42 Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Fri, 9 Jan 2026 11:48:44 +0900 Subject: [PATCH] fmt --- dash-frontend/src/frontend.rs | 4 ++-- uidev/src/testbed/testbed_generic.rs | 2 +- wayvr-ipc/src/client.rs | 4 +--- wayvrctl/src/helper.rs | 12 ++++-------- wayvrctl/src/main.rs | 4 ++-- wgui/src/components/radio_group.rs | 4 ++-- wgui/src/components/tooltip.rs | 2 +- wgui/src/parser/component_button.rs | 5 ++--- wgui/src/parser/component_checkbox.rs | 4 ++-- wgui/src/parser/component_radio_group.rs | 4 ++-- wgui/src/parser/component_slider.rs | 4 ++-- wgui/src/parser/style.rs | 2 +- wgui/src/parser/widget_div.rs | 2 +- wgui/src/parser/widget_image.rs | 3 +-- wgui/src/parser/widget_label.rs | 3 +-- wgui/src/parser/widget_rectangle.rs | 3 +-- wgui/src/parser/widget_sprite.rs | 2 +- wgui/src/renderer_vk/text/mod.rs | 6 +----- wgui/src/windowing/context_menu.rs | 2 +- wgui/src/windowing/window.rs | 2 +- wlx-overlay-s/src/gui/panel/label.rs | 4 +--- wlx-overlay-s/src/ipc/events.rs | 3 +-- wlx-overlay-s/src/ipc/ipc_server.rs | 4 +--- 23 files changed, 33 insertions(+), 52 deletions(-) diff --git a/dash-frontend/src/frontend.rs b/dash-frontend/src/frontend.rs index 63458b8..3616f21 100644 --- a/dash-frontend/src/frontend.rs +++ b/dash-frontend/src/frontend.rs @@ -19,8 +19,8 @@ use wlx_common::{audio, dash_interface::BoxDashInterface, timestep::Timestep}; use crate::{ assets, tab::{ - apps::TabApps, games::TabGames, home::TabHome, monado::TabMonado, processes::TabProcesses, settings::TabSettings, - Tab, TabType, + Tab, TabType, apps::TabApps, games::TabGames, home::TabHome, monado::TabMonado, processes::TabProcesses, + settings::TabSettings, }, util::{ popup_manager::{MountPopupParams, PopupManager, PopupManagerParams}, diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs index 334619b..56e6b46 100644 --- a/uidev/src/testbed/testbed_generic.rs +++ b/uidev/src/testbed/testbed_generic.rs @@ -8,9 +8,9 @@ use glam::Vec2; use wgui::{ assets::AssetPath, components::{ + Component, button::{ButtonClickCallback, ComponentButton}, checkbox::ComponentCheckbox, - Component, }, drawing::Color, event::StyleSetRequest, diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs index 7091175..710444e 100644 --- a/wayvr-ipc/src/client.rs +++ b/wayvr-ipc/src/client.rs @@ -410,9 +410,7 @@ impl WayVRClient { Ok(()) } - pub async fn fn_wlx_overlay_show_hide( - client: WayVRClientMutex, - ) -> anyhow::Result<()> { + pub async fn fn_wlx_overlay_show_hide(client: WayVRClientMutex) -> anyhow::Result<()> { send_only!(client, &PacketClient::WlxShowHide); Ok(()) } diff --git a/wayvrctl/src/helper.rs b/wayvrctl/src/helper.rs index dafda99..266c5ac 100644 --- a/wayvrctl/src/helper.rs +++ b/wayvrctl/src/helper.rs @@ -156,15 +156,11 @@ pub async fn wlx_device_haptics( ) } -pub async fn wlx_overlay_show_hide( - state: &mut WayVRClientState, -) { +pub async fn wlx_overlay_show_hide(state: &mut WayVRClientState) { handle_empty_result( - WayVRClient::fn_wlx_overlay_show_hide( - state.wayvr_client.clone(), - ) - .await - .context("failed to trigger overlay show hide"), + WayVRClient::fn_wlx_overlay_show_hide(state.wayvr_client.clone()) + .await + .context("failed to trigger overlay show hide"), ) } diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs index cb1fea7..e970194 100644 --- a/wayvrctl/src/main.rs +++ b/wayvrctl/src/main.rs @@ -14,8 +14,8 @@ use wayvr_ipc::{ }; use crate::helper::{ - WayVRClientState, wlx_device_haptics, wlx_input_state, wlx_panel_modify, wvr_process_get, - wvr_process_launch, wvr_process_list, wvr_process_terminate, wvr_window_list, + WayVRClientState, wlx_device_haptics, wlx_input_state, wlx_overlay_show_hide, wlx_panel_modify, + wvr_process_get, wvr_process_launch, wvr_process_list, wvr_process_terminate, wvr_window_list, wvr_window_set_visible, }; diff --git a/wgui/src/components/radio_group.rs b/wgui/src/components/radio_group.rs index 4c047a9..1a3b3b5 100644 --- a/wgui/src/components/radio_group.rs +++ b/wgui/src/components/radio_group.rs @@ -1,10 +1,10 @@ use std::{cell::RefCell, rc::Rc}; use crate::{ - components::{checkbox::ComponentCheckbox, Component, ComponentBase, ComponentTrait, RefreshData}, + components::{Component, ComponentBase, ComponentTrait, RefreshData, checkbox::ComponentCheckbox}, event::CallbackDataCommon, layout::WidgetPair, - widget::{div::WidgetDiv, ConstructEssentials}, + widget::{ConstructEssentials, div::WidgetDiv}, }; pub struct RadioValueChangeEvent { diff --git a/wgui/src/components/tooltip.rs b/wgui/src/components/tooltip.rs index 8c3d1c9..ec8e016 100644 --- a/wgui/src/components/tooltip.rs +++ b/wgui/src/components/tooltip.rs @@ -9,11 +9,11 @@ use crate::{ layout::{self, LayoutTask, LayoutTasks, WidgetID, WidgetPair}, renderer_vk::text::{FontWeight, TextStyle}, widget::{ + ConstructEssentials, div::WidgetDiv, label::{WidgetLabel, WidgetLabelParams}, rectangle::{WidgetRectangle, WidgetRectangleParams}, util::WLength, - ConstructEssentials, }, }; diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs index aa58840..c67f0a5 100644 --- a/wgui/src/parser/component_button.rs +++ b/wgui/src/parser/component_button.rs @@ -1,13 +1,12 @@ use crate::{ assets::AssetPath, - components::{button, tooltip, Component}, + components::{Component, button, tooltip}, drawing::Color, i18n::Translation, layout::WidgetID, parser::{ - parse_children, parse_f32, process_component, + AttribPair, ParserContext, ParserFile, parse_children, parse_f32, process_component, style::{parse_color_opt, parse_round, parse_style, parse_text_style}, - AttribPair, ParserContext, ParserFile, }, widget::util::WLength, }; diff --git a/wgui/src/parser/component_checkbox.rs b/wgui/src/parser/component_checkbox.rs index 5d3cdd5..86793ee 100644 --- a/wgui/src/parser/component_checkbox.rs +++ b/wgui/src/parser/component_checkbox.rs @@ -1,8 +1,8 @@ use crate::{ - components::{checkbox, radio_group::ComponentRadioGroup, Component}, + components::{Component, checkbox, radio_group::ComponentRadioGroup}, i18n::Translation, layout::WidgetID, - parser::{process_component, style::parse_style, AttribPair, Fetchable, ParserContext}, + parser::{AttribPair, Fetchable, ParserContext, process_component, style::parse_style}, }; pub enum CheckboxKind { diff --git a/wgui/src/parser/component_radio_group.rs b/wgui/src/parser/component_radio_group.rs index 6587b08..b297aeb 100644 --- a/wgui/src/parser/component_radio_group.rs +++ b/wgui/src/parser/component_radio_group.rs @@ -1,7 +1,7 @@ use crate::{ - components::{radio_group, Component}, + components::{Component, radio_group}, layout::WidgetID, - parser::{parse_children, process_component, style::parse_style, AttribPair, ParserContext, ParserFile}, + parser::{AttribPair, ParserContext, ParserFile, parse_children, process_component, style::parse_style}, }; pub fn parse_component_radio_group<'a>( diff --git a/wgui/src/parser/component_slider.rs b/wgui/src/parser/component_slider.rs index 4a6e1a3..b3c4ec1 100644 --- a/wgui/src/parser/component_slider.rs +++ b/wgui/src/parser/component_slider.rs @@ -1,7 +1,7 @@ use crate::{ - components::{slider, Component}, + components::{Component, slider}, layout::WidgetID, - parser::{process_component, style::parse_style, AttribPair, ParserContext}, + parser::{AttribPair, ParserContext, process_component, style::parse_style}, widget::ConstructEssentials, }; diff --git a/wgui/src/parser/style.rs b/wgui/src/parser/style.rs index 2f6607a..70804e3 100644 --- a/wgui/src/parser/style.rs +++ b/wgui/src/parser/style.rs @@ -5,7 +5,7 @@ use taffy::{ use crate::{ drawing, - parser::{is_percent, parse_color_hex, parse_f32, AttribPair, ParserContext}, + parser::{AttribPair, ParserContext, is_percent, parse_color_hex, parse_f32}, renderer_vk::text::{FontWeight, HorizontalAlign, TextStyle}, widget::util::WLength, }; diff --git a/wgui/src/parser/widget_div.rs b/wgui/src/parser/widget_div.rs index bd755cc..ec26573 100644 --- a/wgui/src/parser/widget_div.rs +++ b/wgui/src/parser/widget_div.rs @@ -1,6 +1,6 @@ use crate::{ layout::WidgetID, - parser::{parse_children, parse_widget_universal, style::parse_style, AttribPair, ParserContext, ParserFile}, + parser::{AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::parse_style}, widget::div::WidgetDiv, }; diff --git a/wgui/src/parser/widget_image.rs b/wgui/src/parser/widget_image.rs index 007b536..329cea5 100644 --- a/wgui/src/parser/widget_image.rs +++ b/wgui/src/parser/widget_image.rs @@ -2,9 +2,8 @@ use crate::{ assets::AssetPath, layout::WidgetID, parser::{ - parse_children, parse_widget_universal, + AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::{parse_color, parse_round, parse_style}, - AttribPair, ParserContext, ParserFile, }, renderer_vk::text::custom_glyph::CustomGlyphData, widget::image::{WidgetImage, WidgetImageParams}, diff --git a/wgui/src/parser/widget_label.rs b/wgui/src/parser/widget_label.rs index 4d3e497..8c69292 100644 --- a/wgui/src/parser/widget_label.rs +++ b/wgui/src/parser/widget_label.rs @@ -2,9 +2,8 @@ use crate::{ i18n::Translation, layout::WidgetID, parser::{ - parse_children, parse_i32, parse_widget_universal, + AttribPair, ParserContext, ParserFile, parse_children, parse_i32, parse_widget_universal, style::{parse_style, parse_text_style}, - AttribPair, ParserContext, ParserFile, }, widget::label::{WidgetLabel, WidgetLabelParams}, }; diff --git a/wgui/src/parser/widget_rectangle.rs b/wgui/src/parser/widget_rectangle.rs index 78b424a..a64da03 100644 --- a/wgui/src/parser/widget_rectangle.rs +++ b/wgui/src/parser/widget_rectangle.rs @@ -2,9 +2,8 @@ use crate::{ drawing::GradientMode, layout::WidgetID, parser::{ - parse_children, parse_widget_universal, + AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::{parse_color, parse_round, parse_style}, - AttribPair, ParserContext, ParserFile, }, widget::rectangle::{WidgetRectangle, WidgetRectangleParams}, }; diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs index 6938b0f..7cfcdb8 100644 --- a/wgui/src/parser/widget_sprite.rs +++ b/wgui/src/parser/widget_sprite.rs @@ -1,7 +1,7 @@ use crate::{ assets::AssetPath, layout::WidgetID, - parser::{parse_children, parse_widget_universal, style::parse_style, AttribPair, ParserContext, ParserFile}, + parser::{AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::parse_style}, renderer_vk::text::custom_glyph::CustomGlyphData, widget::sprite::{WidgetSprite, WidgetSpriteParams}, }; diff --git a/wgui/src/renderer_vk/text/mod.rs b/wgui/src/renderer_vk/text/mod.rs index 4420412..991f224 100644 --- a/wgui/src/renderer_vk/text/mod.rs +++ b/wgui/src/renderer_vk/text/mod.rs @@ -77,11 +77,7 @@ impl From<&TextStyle> for Metrics { impl From<&TextStyle> for Wrap { fn from(value: &TextStyle) -> Self { - if value.wrap { - Self::WordOrGlyph - } else { - Self::None - } + if value.wrap { Self::WordOrGlyph } else { Self::None } } } diff --git a/wgui/src/windowing/context_menu.rs b/wgui/src/windowing/context_menu.rs index 5bf560b..6a139df 100644 --- a/wgui/src/windowing/context_menu.rs +++ b/wgui/src/windowing/context_menu.rs @@ -4,7 +4,7 @@ use glam::Vec2; use crate::{ assets::AssetPath, - components::{button::ComponentButton, ComponentTrait}, + components::{ComponentTrait, button::ComponentButton}, globals::WguiGlobals, i18n::Translation, layout::Layout, diff --git a/wgui/src/windowing/window.rs b/wgui/src/windowing/window.rs index 4999b79..89d8b77 100644 --- a/wgui/src/windowing/window.rs +++ b/wgui/src/windowing/window.rs @@ -13,7 +13,7 @@ use crate::{ i18n::Translation, layout::{Layout, LayoutTask, LayoutTasks, WidgetPair}, parser::{self, Fetchable, ParserState}, - widget::{div::WidgetDiv, label::WidgetLabel, rectangle::WidgetRectangle, EventResult}, + widget::{EventResult, div::WidgetDiv, label::WidgetLabel, rectangle::WidgetRectangle}, }; struct OpenedWindow { diff --git a/wlx-overlay-s/src/gui/panel/label.rs b/wlx-overlay-s/src/gui/panel/label.rs index 054b805..b13d804 100644 --- a/wlx-overlay-s/src/gui/panel/label.rs +++ b/wlx-overlay-s/src/gui/panel/label.rs @@ -120,9 +120,7 @@ pub(super) fn setup_custom_label( "%H:%M" } } - unk => { - unk - } + unk => unk, }; let state = ClockLabelState { diff --git a/wlx-overlay-s/src/ipc/events.rs b/wlx-overlay-s/src/ipc/events.rs index 3a8549a..d941323 100644 --- a/wlx-overlay-s/src/ipc/events.rs +++ b/wlx-overlay-s/src/ipc/events.rs @@ -51,8 +51,7 @@ where .enqueue(TaskType::Input(InputTask::Haptics { device, haptics })); } WayVRSignal::ShowHide => { - app.tasks - .enqueue(TaskType::Overlay(OverlayTask::ShowHide)); + app.tasks.enqueue(TaskType::Overlay(OverlayTask::ShowHide)); } WayVRSignal::DropOverlay(overlay_id) => { app.tasks diff --git a/wlx-overlay-s/src/ipc/ipc_server.rs b/wlx-overlay-s/src/ipc/ipc_server.rs index 7b6d99a..240ed59 100644 --- a/wlx-overlay-s/src/ipc/ipc_server.rs +++ b/wlx-overlay-s/src/ipc/ipc_server.rs @@ -350,9 +350,7 @@ impl Connection { )); } - fn handle_wlx_overlay_show_hide( - params: &mut TickParams - ) { + fn handle_wlx_overlay_show_hide(params: &mut TickParams) { params.signals.send(WayVRSignal::ShowHide); }