diff --git a/dash-frontend/assets/gui/dashboard.xml b/dash-frontend/assets/gui/dashboard.xml
index 0147008..76f51aa 100644
--- a/dash-frontend/assets/gui/dashboard.xml
+++ b/dash-frontend/assets/gui/dashboard.xml
@@ -15,7 +15,10 @@
height="~side_button_size"
color="#44444400"
hover_color="#333333ff"
- hover_border_color="#555555ff">
+ hover_border_color="#555555ff"
+ tooltip="${tooltip}"
+ tooltip_side="${tooltip_side}"
+ >
@@ -43,13 +46,13 @@
align_items="center"
gap="4"
>
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/dash-frontend/src/lib.rs b/dash-frontend/src/lib.rs
index 256e61f..f6c072a 100644
--- a/dash-frontend/src/lib.rs
+++ b/dash-frontend/src/lib.rs
@@ -14,8 +14,8 @@ use wgui::{
};
use crate::tab::{
- apps::TabApps, games::TabGames, home::TabHome, monado::TabMonado, processes::TabProcesses, settings::TabSettings,
- Tab, TabParams, TabType,
+ Tab, TabParams, TabType, apps::TabApps, games::TabGames, home::TabHome, monado::TabMonado, processes::TabProcesses,
+ settings::TabSettings,
};
mod assets;
diff --git a/uidev/assets/gui/various_widgets.xml b/uidev/assets/gui/various_widgets.xml
index 8501b42..e6614a5 100644
--- a/uidev/assets/gui/various_widgets.xml
+++ b/uidev/assets/gui/various_widgets.xml
@@ -12,9 +12,9 @@
-
-
-
+
+
+
diff --git a/uidev/src/main.rs b/uidev/src/main.rs
index dab5f0b..c9d2489 100644
--- a/uidev/src/main.rs
+++ b/uidev/src/main.rs
@@ -1,26 +1,26 @@
-use glam::{vec2, Vec2};
+use glam::{Vec2, vec2};
use std::sync::Arc;
-use testbed::{testbed_any::TestbedAny, Testbed};
+use testbed::{Testbed, testbed_any::TestbedAny};
use timestep::Timestep;
+use tracing_subscriber::EnvFilter;
use tracing_subscriber::filter::LevelFilter;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::EnvFilter;
use vulkan::init_window;
use vulkano::{
+ Validated, VulkanError,
command_buffer::CommandBufferUsage,
format::Format,
- image::{view::ImageView, ImageUsage},
+ image::{ImageUsage, view::ImageView},
swapchain::{
- acquire_next_image, CompositeAlpha, PresentMode, Surface, SurfaceInfo, Swapchain,
- SwapchainCreateInfo, SwapchainPresentInfo,
+ CompositeAlpha, PresentMode, Surface, SurfaceInfo, Swapchain, SwapchainCreateInfo,
+ SwapchainPresentInfo, acquire_next_image,
},
sync::GpuFuture,
- Validated, VulkanError,
};
use wgui::{
event::{MouseButtonIndex, MouseDownEvent, MouseMotionEvent, MouseUpEvent, MouseWheelEvent},
- gfx::{cmd::WGfxClearMode, WGfx},
+ gfx::{WGfx, cmd::WGfxClearMode},
renderer_vk::{self},
};
use winit::{
@@ -32,7 +32,7 @@ use winit::{
use crate::{
rate_limiter::RateLimiter,
testbed::{
- testbed_dashboard::TestbedDashboard, testbed_generic::TestbedGeneric, TestbedUpdateParams,
+ TestbedUpdateParams, testbed_dashboard::TestbedDashboard, testbed_generic::TestbedGeneric,
},
};
diff --git a/wgui/doc/widgets.md b/wgui/doc/widgets.md
index 343d556..047583b 100644
--- a/wgui/doc/widgets.md
+++ b/wgui/doc/widgets.md
@@ -190,6 +190,12 @@ _Translated by key_
`hover_border_color`: #FFAABB | #FFAABBCC
+`tooltip`: **string**
+
+_Tooltip text on hover, translated by key_
+
+`tooltip_side`: "top" | "bottom" | "left" | "right" (default: top)
+
#### Info
Child widgets are supported and can be added directly in XML.
diff --git a/wgui/src/animation.rs b/wgui/src/animation.rs
index 10ef809..f4c480c 100644
--- a/wgui/src/animation.rs
+++ b/wgui/src/animation.rs
@@ -98,14 +98,12 @@ impl Animation {
return; // failed
};
- let widget_node = *state.nodes.get(self.target_widget).unwrap();
-
let mut widget_state = widget.state();
let (data, obj) = widget_state.get_data_obj_mut();
let data = &mut CallbackData {
widget_id: self.target_widget,
- widget_boundary: state.get_widget_boundary(widget_node),
+ widget_boundary: state.get_widget_boundary(self.target_widget),
obj,
data,
pos,
diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index 643147e..85caccc 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -1,19 +1,19 @@
use crate::{
animation::{Animation, AnimationEasing},
- components::{tooltip::ComponentTooltip, Component, ComponentBase, ComponentTrait, InitData},
+ components::{self, Component, ComponentBase, ComponentTrait, InitData, tooltip::ComponentTooltip},
drawing::{self, Boundary, Color},
event::{CallbackDataCommon, EventListenerCollection, EventListenerID, EventListenerKind},
i18n::Translation,
- layout::{WidgetID, WidgetPair},
+ layout::{LayoutTask, WidgetID, WidgetPair},
renderer_vk::{
text::{FontWeight, TextStyle},
util::centered_matrix,
},
widget::{
+ ConstructEssentials, EventResult, WidgetData,
label::{WidgetLabel, WidgetLabelParams},
rectangle::{WidgetRectangle, WidgetRectangleParams},
util::WLength,
- ConstructEssentials, EventResult, WidgetData,
},
};
use glam::{Mat4, Vec3};
@@ -30,6 +30,7 @@ pub struct Params {
pub round: WLength,
pub style: taffy::Style,
pub text_style: TextStyle,
+ pub tooltip: Option,
}
impl Default for Params {
@@ -44,6 +45,7 @@ impl Default for Params {
round: WLength::Units(4.0),
style: Default::default(),
text_style: TextStyle::default(),
+ tooltip: None,
}
}
}
@@ -55,8 +57,7 @@ struct State {
hovered: bool,
down: bool,
on_click: Option,
-
- tooltip: Option,
+ active_tooltip: Option>,
}
struct Data {
@@ -145,6 +146,7 @@ fn register_event_mouse_enter(
data: Rc,
state: Rc>,
listeners: &mut EventListenerCollection,
+ info: Option,
) -> EventListenerID {
listeners.register(
EventListenerKind::MouseEnter,
@@ -157,26 +159,20 @@ fn register_event_mouse_enter(
event_data.widget_id,
true,
));
- let mut state = state.borrow_mut();
- // todo
- /*common.alterables.tasks.push(LayoutTask::ModifyLayoutState({
- let parent = data.id_rect.clone();
- Box::new(move |m| {
- components::tooltip::construct(
- &mut ConstructEssentials {
- layout: m.layout,
- listeners: &listeners,
- parent,
- },
- components::tooltip::Params {
- text: Translation::from_raw_text("this is a tooltip"),
- },
- );
- })
- }));*/
+ if let Some(info) = info.clone() {
+ common.alterables.tasks.push(LayoutTask::ModifyLayoutState({
+ let widget_to_watch = data.id_rect;
+ let state = state.clone();
+ Box::new(move |m| {
+ state.borrow_mut().active_tooltip =
+ Some(components::tooltip::show(m.layout, widget_to_watch, info.clone())?);
+ Ok(())
+ })
+ }));
+ }
- state.hovered = true;
+ state.borrow_mut().hovered = true;
Ok(EventResult::Pass)
}),
)
@@ -198,7 +194,7 @@ fn register_event_mouse_leave(
false,
));
let mut state = state.borrow_mut();
- state.tooltip = None;
+ state.active_tooltip = None;
state.hovered = false;
Ok(EventResult::Pass)
}),
@@ -220,7 +216,7 @@ fn register_event_mouse_press(
rect,
event_data.widget_data,
&data,
- common.state.get_widget_boundary(event_data.node_id),
+ common.state.get_node_boundary(event_data.node_id),
1.0,
true,
);
@@ -251,7 +247,7 @@ fn register_event_mouse_release(
rect,
event_data.widget_data,
&data,
- common.state.get_widget_boundary(event_data.node_id),
+ common.state.get_node_boundary(event_data.node_id),
1.0,
false,
);
@@ -366,14 +362,14 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
down: false,
hovered: false,
on_click: None,
- tooltip: None,
+ active_tooltip: None,
}));
let base = ComponentBase {
lhandles: {
let mut widget = ess.layout.state.widgets.get(id_rect).unwrap().state();
vec![
- register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners),
+ register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners, params.tooltip),
register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners),
register_event_mouse_press(data.clone(), state.clone(), &mut widget.event_listeners),
register_event_mouse_release(data.clone(), state.clone(), &mut widget.event_listeners),
diff --git a/wgui/src/components/tooltip.rs b/wgui/src/components/tooltip.rs
index cb35606..9909901 100644
--- a/wgui/src/components/tooltip.rs
+++ b/wgui/src/components/tooltip.rs
@@ -1,29 +1,50 @@
+use glam::{Mat4, Vec3};
use std::{cell::RefCell, rc::Rc};
use taffy::prelude::length;
use crate::{
- components::{Component, ComponentBase, ComponentTrait, InitData},
+ components::{self, Component, ComponentBase, ComponentTrait, InitData},
drawing::Color,
- event::{EventListenerCollection, EventListenerKind},
i18n::Translation,
- layout::{LayoutTasks, WidgetID, WidgetPair},
+ layout::{self, LayoutTask, LayoutTasks, WidgetID, WidgetPair},
renderer_vk::text::{FontWeight, TextStyle},
widget::{
+ ConstructEssentials,
+ div::WidgetDiv,
label::{WidgetLabel, WidgetLabelParams},
rectangle::{WidgetRectangle, WidgetRectangleParams},
util::WLength,
- ConstructEssentials, EventResult,
},
};
-pub struct Params {
+#[derive(Clone, Default)]
+pub enum TooltipSide {
+ Left,
+ Right,
+ Top,
+ #[default]
+ Bottom,
+}
+
+#[derive(Clone)]
+pub struct TooltipInfo {
pub text: Translation,
+ pub side: TooltipSide,
+}
+
+pub struct Params {
+ pub info: TooltipInfo,
+ pub widget_to_watch: WidgetID,
}
impl Default for Params {
fn default() -> Self {
Self {
- text: Translation::from_raw_text(""),
+ info: TooltipInfo {
+ text: Translation::from_raw_text(""),
+ side: TooltipSide::Bottom,
+ },
+ widget_to_watch: WidgetID::default(),
}
}
}
@@ -32,13 +53,13 @@ struct State {}
#[allow(clippy::struct_field_names)]
struct Data {
- id_container: WidgetID, // Rectangle
- id_label: WidgetID, // Label, parent of container
+ id_root: WidgetID, // Rectangle
}
pub struct ComponentTooltip {
base: ComponentBase,
data: Rc,
+ #[allow(dead_code)]
state: Rc>,
tasks: LayoutTasks,
}
@@ -53,61 +74,110 @@ impl ComponentTrait for ComponentTooltip {
impl ComponentTooltip {}
-fn register_event_mouse_enter(listeners: &mut EventListenerCollection) -> crate::event::EventListenerID {
- listeners.register(
- EventListenerKind::MouseEnter,
- Box::new(move |common, _event_data, (), ()| {
- common.alterables.trigger_haptics();
- Ok(EventResult::Pass)
- }),
- )
-}
-
-fn register_event_mouse_leave(listeners: &mut EventListenerCollection) -> crate::event::EventListenerID {
- listeners.register(
- EventListenerKind::MouseEnter,
- Box::new(move |common, _event_data, (), ()| {
- common.alterables.trigger_haptics();
- Ok(EventResult::Pass)
- }),
- )
+impl Drop for ComponentTooltip {
+ fn drop(&mut self) {
+ self.tasks.push(LayoutTask::RemoveWidget(self.data.id_root));
+ }
}
+#[allow(clippy::too_many_lines)]
pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc)> {
- let style = taffy::Style {
- align_items: Some(taffy::AlignItems::Center),
- justify_content: Some(taffy::JustifyContent::Center),
- gap: length(4.0),
- padding: taffy::Rect {
- left: length(8.0),
- right: length(8.0),
- top: length(4.0),
- bottom: length(4.0),
- },
- ..Default::default()
+ let absolute_boundary = {
+ let widget_to_watch = ess
+ .layout
+ .state
+ .widgets
+ .get(params.widget_to_watch)
+ .ok_or_else(|| anyhow::anyhow!("widget_to_watch is invalid"))?;
+ let widget_to_watch_state = widget_to_watch.state();
+ widget_to_watch_state.data.cached_absolute_boundary
+ };
+
+ let spacing = 8.0;
+
+ let transform = Mat4::from_translation(Vec3::new(-0.5, 0.0, 0.0));
+
+ let (pin_left, pin_top, pin_align_items, pin_justify_content) = match params.info.side {
+ TooltipSide::Left => (
+ absolute_boundary.left() - spacing,
+ absolute_boundary.top() + absolute_boundary.size.y / 2.0,
+ taffy::AlignItems::Center,
+ taffy::JustifyContent::End,
+ ),
+ TooltipSide::Right => (
+ absolute_boundary.left() + absolute_boundary.size.x + spacing,
+ absolute_boundary.top() + absolute_boundary.size.y / 2.0,
+ taffy::AlignItems::Center,
+ taffy::JustifyContent::Start,
+ ),
+ TooltipSide::Top => (
+ absolute_boundary.left() + absolute_boundary.size.x / 2.0,
+ absolute_boundary.top() - spacing,
+ taffy::AlignItems::End,
+ taffy::JustifyContent::Center,
+ ),
+ TooltipSide::Bottom => (
+ absolute_boundary.left() + absolute_boundary.size.x / 2.0,
+ absolute_boundary.top() + absolute_boundary.size.y + spacing,
+ taffy::AlignItems::Baseline,
+ taffy::JustifyContent::Center,
+ ),
};
let globals = ess.layout.state.globals.clone();
- let (root, _) = ess.layout.add_child(
+ let (div, _) = ess.layout.add_child(
ess.parent,
- WidgetRectangle::create(WidgetRectangleParams {
- color: Color::new(1.0, 1.0, 1.0, 0.0),
- border_color: Color::new(1.0, 1.0, 1.0, 0.0),
- round: WLength::Units(5.0),
+ WidgetDiv::create(),
+ taffy::Style {
+ align_items: Some(pin_align_items),
+ justify_content: Some(pin_justify_content),
+ position: taffy::Position::Absolute,
+ margin: taffy::Rect {
+ left: length(pin_left),
+ top: length(pin_top),
+ bottom: length(0.0),
+ right: length(0.0),
+ },
+ /* important, to make it centered! */
+ size: taffy::Size {
+ width: length(0.0),
+ height: length(0.0),
+ },
..Default::default()
- }),
- style,
+ },
)?;
- let id_container = root.id;
+ div.widget.state().data.transform = transform;
- let (label, _node_label) = ess.layout.add_child(
- id_container,
+ let (rect, _) = ess.layout.add_child(
+ div.id,
+ WidgetRectangle::create(WidgetRectangleParams {
+ color: Color::new(0.1, 0.1, 0.1, 0.8),
+ border_color: Color::new(0.3, 0.3, 0.3, 1.0),
+ border: 2.0,
+ round: WLength::Percent(1.0),
+ ..Default::default()
+ }),
+ taffy::Style {
+ position: taffy::Position::Relative,
+ gap: length(4.0),
+ padding: taffy::Rect {
+ left: length(16.0),
+ right: length(16.0),
+ top: length(8.0),
+ bottom: length(8.0),
+ },
+ ..Default::default()
+ },
+ )?;
+
+ let (_label, _) = ess.layout.add_child(
+ rect.id,
WidgetLabel::create(
&mut globals.get(),
WidgetLabelParams {
- content: params.text,
+ content: params.info.text,
style: TextStyle {
weight: Some(FontWeight::Bold),
..Default::default()
@@ -117,22 +187,11 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
Default::default(),
)?;
- let data = Rc::new(Data {
- id_container,
- id_label: label.id,
- });
+ let data = Rc::new(Data { id_root: div.id });
let state = Rc::new(RefCell::new(State {}));
- let base = ComponentBase {
- lhandles: {
- let mut widget = ess.layout.state.widgets.get(id_container).unwrap().state();
- vec![
- register_event_mouse_enter(&mut widget.event_listeners),
- register_event_mouse_leave(&mut widget.event_listeners),
- ]
- },
- };
+ let base = ComponentBase::default();
let tooltip = Rc::new(ComponentTooltip {
base,
@@ -142,5 +201,18 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
});
ess.layout.defer_component_init(Component(tooltip.clone()));
- Ok((root, tooltip))
+ Ok((div, tooltip))
+}
+
+pub fn show(
+ layout: &mut layout::Layout,
+ widget_to_watch: WidgetID,
+ info: TooltipInfo,
+) -> anyhow::Result> {
+ let parent = layout.tree_root_widget;
+ let (_, tooltip) = components::tooltip::construct(
+ &mut ConstructEssentials { layout, parent },
+ components::tooltip::Params { info, widget_to_watch },
+ )?;
+ Ok(tooltip)
}
diff --git a/wgui/src/event.rs b/wgui/src/event.rs
index 970f4e9..1a3112d 100644
--- a/wgui/src/event.rs
+++ b/wgui/src/event.rs
@@ -5,7 +5,7 @@ use std::{
};
use glam::Vec2;
-use slotmap::{new_key_type, DenseSlotMap};
+use slotmap::{DenseSlotMap, new_key_type};
use crate::{
animation::{self, Animation},
@@ -92,6 +92,7 @@ impl Event {
}
}
+// alterables which will be dispatched in the next loop iteration phase
#[derive(Default)]
pub struct EventAlterables {
pub dirty_nodes: Vec,
@@ -105,6 +106,7 @@ pub struct EventAlterables {
pub trigger_haptics: bool,
}
+// helper functions
impl EventAlterables {
pub const fn mark_redraw(&mut self) {
self.needs_redraw = true;
diff --git a/wgui/src/i18n.rs b/wgui/src/i18n.rs
index b95193a..9fee6c5 100644
--- a/wgui/src/i18n.rs
+++ b/wgui/src/i18n.rs
@@ -5,7 +5,7 @@ use crate::assets::AssetProvider;
// a string which optionally has translation key in it
// it will hopefully support dynamic language changing soon
// for now it's just a simple string container
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
pub struct Translation {
pub text: Rc,
pub translated: bool, // if true, `text` is a translation key
diff --git a/wgui/src/layout.rs b/wgui/src/layout.rs
index 953ed9e..7c2b468 100644
--- a/wgui/src/layout.rs
+++ b/wgui/src/layout.rs
@@ -8,14 +8,14 @@ use std::{
use crate::{
animation::Animations,
components::{Component, InitData},
- drawing::{self, push_scissor_stack, push_transform_stack, Boundary, ANSI_BOLD_CODE, ANSI_RESET_CODE},
+ drawing::{self, ANSI_BOLD_CODE, ANSI_RESET_CODE, Boundary, push_scissor_stack, push_transform_stack},
event::{self, CallbackDataCommon, EventAlterables},
globals::WguiGlobals,
- widget::{self, div::WidgetDiv, EventParams, EventResult, WidgetObj, WidgetState},
+ widget::{self, EventParams, EventResult, WidgetObj, WidgetState, div::WidgetDiv},
};
-use glam::{vec2, Vec2};
-use slotmap::{new_key_type, HopSlotMap, SecondaryMap};
+use glam::{Vec2, vec2};
+use slotmap::{HopSlotMap, SecondaryMap, new_key_type};
use taffy::{NodeId, TaffyTree, TraversePartialTree};
new_key_type! {
@@ -112,13 +112,13 @@ pub struct LayoutState {
pub struct ModifyLayoutStateData<'a> {
pub layout: &'a mut Layout,
- // don't uncomment this, todo!
- // pub listeners: &'a mut EventListenerCollection,
}
+pub type ModifyLayoutStateFunc = Box anyhow::Result<()>>;
+
pub enum LayoutTask {
RemoveWidget(WidgetID),
- ModifyLayoutState(Box),
+ ModifyLayoutState(ModifyLayoutStateFunc),
}
#[derive(Clone)]
@@ -396,6 +396,8 @@ impl Layout {
// see drawing.rs draw_widget too
push_transform_stack(&mut alterables.transform_stack, l, scroll_shift, &widget);
+ widget.data.cached_absolute_boundary = drawing::Boundary::construct_absolute(&alterables.transform_stack);
+
let scissor_pushed = push_scissor_stack(
&mut alterables.transform_stack,
&mut alterables.scissor_stack,
@@ -589,7 +591,7 @@ impl Layout {
Ok(())
}
- fn process_tasks(&mut self) {
+ pub fn process_tasks(&mut self) -> anyhow::Result<()> {
let tasks = self.tasks.clone();
let mut tasks = tasks.0.borrow_mut();
while let Some(task) = tasks.pop_front() {
@@ -597,9 +599,13 @@ impl Layout {
LayoutTask::RemoveWidget(widget_id) => {
self.remove_widget(widget_id);
}
- LayoutTask::ModifyLayoutState(_fn) => todo!(),
+ LayoutTask::ModifyLayoutState(callback) => {
+ (*callback)(ModifyLayoutStateData { layout: self })?;
+ }
}
}
+
+ Ok(())
}
pub fn process_alterables(&mut self, alterables: EventAlterables) -> anyhow::Result<()> {
@@ -607,7 +613,7 @@ impl Layout {
self.tasks.push(task);
}
- self.process_tasks();
+ self.process_tasks()?;
for node in alterables.dirty_nodes {
self.state.tree.mark_dirty(node)?;
@@ -698,7 +704,7 @@ impl Layout {
}
impl LayoutState {
- pub fn get_widget_boundary(&self, id: NodeId) -> Boundary {
+ pub fn get_node_boundary(&self, id: NodeId) -> Boundary {
let Ok(layout) = self.tree.layout(id) else {
return Boundary::default();
};
@@ -709,11 +715,27 @@ impl LayoutState {
}
}
- pub fn get_widget_size(&self, id: NodeId) -> Vec2 {
+ pub fn get_node_size(&self, id: NodeId) -> Vec2 {
let Ok(layout) = self.tree.layout(id) else {
return Vec2::ZERO;
};
Vec2::new(layout.size.width, layout.size.height)
}
+
+ pub fn get_widget_boundary(&self, id: WidgetID) -> Boundary {
+ let Some(node_id) = self.nodes.get(id) else {
+ return Boundary::default();
+ };
+
+ self.get_node_boundary(*node_id)
+ }
+
+ pub fn get_widget_size(&self, id: WidgetID) -> Vec2 {
+ let Some(node_id) = self.nodes.get(id) else {
+ return Vec2::ZERO;
+ };
+
+ self.get_node_size(*node_id)
+ }
}
diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs
index ebf7355..4593b94 100644
--- a/wgui/src/parser/component_button.rs
+++ b/wgui/src/parser/component_button.rs
@@ -1,10 +1,10 @@
use crate::{
- components::{Component, button},
+ components::{self, Component, button, tooltip},
drawing::Color,
i18n::Translation,
layout::WidgetID,
parser::{
- AttribPair, ParserContext, ParserFile, parse_check_f32, parse_children, process_component,
+ AttribPair, ParserContext, ParserFile, parse_check_f32, parse_children, print_invalid_attrib, process_component,
style::{parse_color_opt, parse_round, parse_style, parse_text_style},
},
widget::util::WLength,
@@ -23,6 +23,8 @@ pub fn parse_component_button<'a>(
let mut hover_color: Option = None;
let mut hover_border_color: Option = None;
let mut round = WLength::Units(4.0);
+ let mut tooltip: Option = None;
+ let mut tooltip_side: Option = None;
let mut translation: Option = None;
@@ -56,6 +58,19 @@ pub fn parse_component_button<'a>(
"hover_border_color" => {
parse_color_opt(value, &mut hover_border_color);
}
+ "tooltip" => tooltip = Some(String::from(value)),
+ "tooltip_side" => {
+ tooltip_side = match value {
+ "left" => Some(tooltip::TooltipSide::Left),
+ "right" => Some(tooltip::TooltipSide::Right),
+ "top" => Some(tooltip::TooltipSide::Top),
+ "bottom" => Some(tooltip::TooltipSide::Bottom),
+ _ => {
+ print_invalid_attrib(key, value);
+ None
+ }
+ }
+ }
_ => {}
}
}
@@ -72,6 +87,10 @@ pub fn parse_component_button<'a>(
style,
text_style,
round,
+ tooltip: tooltip.map(|t| tooltip::TooltipInfo {
+ side: tooltip_side.map_or(tooltip::TooltipSide::Bottom, |f| f),
+ text: Translation::from_translation_key(&t),
+ }),
},
)?;
@@ -79,4 +98,4 @@ pub fn parse_component_button<'a>(
parse_children(file, ctx, node, widget.id)?;
Ok(widget.id)
-}
\ No newline at end of file
+}
diff --git a/wgui/src/widget/mod.rs b/wgui/src/widget/mod.rs
index 1dca54d..ebec601 100644
--- a/wgui/src/widget/mod.rs
+++ b/wgui/src/widget/mod.rs
@@ -27,6 +27,7 @@ pub struct WidgetData {
pub scrolling_cur: Vec2, // normalized, used for smooth scrolling animation
pub scrolling_cur_prev: Vec2, // for motion interpolation while rendering between ticks
pub transform: glam::Mat4,
+ pub cached_absolute_boundary: drawing::Boundary, // updated in Layout::push_event_widget
}
impl WidgetData {
@@ -95,6 +96,7 @@ impl WidgetState {
scrolling_cur: Vec2::default(),
scrolling_cur_prev: Vec2::default(),
transform: glam::Mat4::IDENTITY,
+ cached_absolute_boundary: drawing::Boundary::default(),
},
obj,
event_listeners: EventListenerCollection::default(),