diff --git a/dash-frontend/src/frontend.rs b/dash-frontend/src/frontend.rs index 48d68608..a2f9c4d3 100644 --- a/dash-frontend/src/frontend.rs +++ b/dash-frontend/src/frontend.rs @@ -31,8 +31,8 @@ use wlx_common::{ use crate::{ assets, tab::{ - apps::TabApps, donate::TabDonate, games::TabGames, home::TabHome, monado::TabMonado, settings::TabSettings, - welcome::TabWelcome, Tab, TabType, + Tab, TabType, apps::TabApps, donate::TabDonate, games::TabGames, home::TabHome, monado::TabMonado, + settings::TabSettings, welcome::TabWelcome, }, util::{ popup_manager::{MountPopupOnceParams, PopupManager, PopupManagerParams}, diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs index f78be9ef..948f17b3 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, font_config::WguiFontConfig, diff --git a/wgui/src/components/checkbox.rs b/wgui/src/components/checkbox.rs index 6d95a038..9f6f9700 100644 --- a/wgui/src/components/checkbox.rs +++ b/wgui/src/components/checkbox.rs @@ -221,13 +221,13 @@ fn register_event_mouse_enter( ) -> EventListenerID { listeners.register( EventListenerKind::MouseEnter, - Box::new(move |common, event_data, (), ()| { + Box::new(move |common, _event_data, (), ()| { common.alterables.trigger_haptics(); common .alterables .animate(anim_hover_in(state.clone(), data.clone(), anim_mult)); - ComponentTooltip::register_hover_in(common, &tooltip_info, event_data.widget_id, state.clone()); + ComponentTooltip::register_hover_in(common, &tooltip_info, data.id_container, state.clone()); let checked = { let mut state = state.borrow_mut(); diff --git a/wlx-common/src/palette.rs b/wlx-common/src/palette.rs index f7dc74bc..2b1a7488 100644 --- a/wlx-common/src/palette.rs +++ b/wlx-common/src/palette.rs @@ -1,10 +1,10 @@ use std::{fs::File, io::BufReader}; -use serde::{de::Error as _, Deserialize, Deserializer}; +use serde::{Deserialize, Deserializer, de::Error as _}; use wgui::{ drawing, log::LogErr, - palette::{WguiColorPalette, PALETTES}, + palette::{PALETTES, WguiColorPalette}, }; use crate::config_io;