From de4af54928fe84123e62c06ba13bb6c09935841c Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Thu, 26 Sep 2019 02:25:14 +0200 Subject: [PATCH] test tooltips --- voxygen/src/hud/bag.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs index 8b60cdd158..d6799473b4 100644 --- a/voxygen/src/hud/bag.rs +++ b/voxygen/src/hud/bag.rs @@ -165,7 +165,7 @@ impl<'a> Widget for Bag<'a> { let is_selected = Some(i) == state.selected_slot; // Slot - if Button::image(self.imgs.inv_slot) + let slot_widget = Button::image(self.imgs.inv_slot) .top_left_with_margins_on( state.ids.inv_alignment, 4.0 + y as f64 * (40.0 + 4.0), @@ -178,9 +178,17 @@ impl<'a> Widget for Bag<'a> { } else { color::DARK_YELLOW }) - .floating(true) - .with_tooltip(self.tooltip_manager, "Test", "", &item_tooltip) + .floating(true); + + // Item + if if item.is_some() { + slot_widget + .with_tooltip(self.tooltip_manager, "Test Item", "Use: Restores 10 Health.", &item_tooltip) .set(state.ids.inv_slots[i], ui) +} else { + slot_widget + .set(state.ids.inv_slots[i], ui) +} .was_clicked() { let selected_slot = match state.selected_slot { @@ -197,8 +205,7 @@ impl<'a> Widget for Bag<'a> { }; state.update(|s| s.selected_slot = selected_slot); } - - // Item + // Item if item.is_some() { Button::image(self.imgs.potion_red) // TODO: Insert variable image depending on the item displayed in that slot .w_h(4.0 * 4.4, 7.0 * 4.4) // TODO: Fix height and scale width correctly to that to avoid a stretched item image