mirror of https://github.com/wayvr-org/wayvr.git
fix checkbox tooltips + fmt
This commit is contained in:
parent
e895a61ea0
commit
5407e53700
|
|
@ -31,8 +31,8 @@ use wlx_common::{
|
||||||
use crate::{
|
use crate::{
|
||||||
assets,
|
assets,
|
||||||
tab::{
|
tab::{
|
||||||
apps::TabApps, donate::TabDonate, games::TabGames, home::TabHome, monado::TabMonado, settings::TabSettings,
|
Tab, TabType, apps::TabApps, donate::TabDonate, games::TabGames, home::TabHome, monado::TabMonado,
|
||||||
welcome::TabWelcome, Tab, TabType,
|
settings::TabSettings, welcome::TabWelcome,
|
||||||
},
|
},
|
||||||
util::{
|
util::{
|
||||||
popup_manager::{MountPopupOnceParams, PopupManager, PopupManagerParams},
|
popup_manager::{MountPopupOnceParams, PopupManager, PopupManagerParams},
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,9 @@ use glam::Vec2;
|
||||||
use wgui::{
|
use wgui::{
|
||||||
assets::AssetPath,
|
assets::AssetPath,
|
||||||
components::{
|
components::{
|
||||||
|
Component,
|
||||||
button::{ButtonClickCallback, ComponentButton},
|
button::{ButtonClickCallback, ComponentButton},
|
||||||
checkbox::ComponentCheckbox,
|
checkbox::ComponentCheckbox,
|
||||||
Component,
|
|
||||||
},
|
},
|
||||||
drawing::Color,
|
drawing::Color,
|
||||||
font_config::WguiFontConfig,
|
font_config::WguiFontConfig,
|
||||||
|
|
|
||||||
|
|
@ -221,13 +221,13 @@ fn register_event_mouse_enter(
|
||||||
) -> EventListenerID {
|
) -> EventListenerID {
|
||||||
listeners.register(
|
listeners.register(
|
||||||
EventListenerKind::MouseEnter,
|
EventListenerKind::MouseEnter,
|
||||||
Box::new(move |common, event_data, (), ()| {
|
Box::new(move |common, _event_data, (), ()| {
|
||||||
common.alterables.trigger_haptics();
|
common.alterables.trigger_haptics();
|
||||||
common
|
common
|
||||||
.alterables
|
.alterables
|
||||||
.animate(anim_hover_in(state.clone(), data.clone(), anim_mult));
|
.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 checked = {
|
||||||
let mut state = state.borrow_mut();
|
let mut state = state.borrow_mut();
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
use std::{fs::File, io::BufReader};
|
use std::{fs::File, io::BufReader};
|
||||||
|
|
||||||
use serde::{de::Error as _, Deserialize, Deserializer};
|
use serde::{Deserialize, Deserializer, de::Error as _};
|
||||||
use wgui::{
|
use wgui::{
|
||||||
drawing,
|
drawing,
|
||||||
log::LogErr,
|
log::LogErr,
|
||||||
palette::{WguiColorPalette, PALETTES},
|
palette::{PALETTES, WguiColorPalette},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::config_io;
|
use crate::config_io;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue