Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added item descriptions to tooltip

Browse Source
This commit is contained in:
Joshua Barretto 2019-09-26 14:41:04 +01:00
parent de4af54928
commit 3a8b146687
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
voxygen/src/hud/bag.rs
View File

@ -2,7 +2,7 @@ use super::{
img_ids::{Imgs, ImgsRot},
Event as HudEvent, Fonts, TEXT_COLOR, TEXT_COLOR_2,
};
use crate::ui::{ImageFrame, Tooltip, TooltipManager, Tooltipable};
use crate::ui::{ImageFrame, Tooltip, Tooltipable};
use client::Client;
use conrod_core::{
color,
@ -178,19 +178,23 @@ impl<'a> Widget for Bag<'a> {
} else {
color::DARK_YELLOW
})
.floating(true);
.floating(true);
let slot_widget = if let Some(item) = item {
slot_widget
.with_tooltip(
self.tooltip_manager,
&item.description(),
&item.category(),
&item_tooltip,
)
.set(state.ids.inv_slots[i], ui)
} else {
slot_widget.set(state.ids.inv_slots[i], ui)
};
// 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()
{
if slot_widget.was_clicked() {
let selected_slot = match state.selected_slot {
Some(a) => {
if a == i {
@ -205,7 +209,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
@ -217,7 +221,7 @@ impl<'a> Widget for Bag<'a> {
.label_y(Relative::Scalar(-10.0))
.label_color(TEXT_COLOR)
.parent(state.ids.inv_slots[i])
.graphics_for(state.ids.inv_slots[i])
.graphics_for(state.ids.inv_slots[i])
.set(state.ids.items[i], ui);
}
}

2
voxygen/src/ui/mod.rs
View File

@ -16,7 +16,7 @@ pub use widgets::{
image_slider::ImageSlider,
ingame::{Ingame, IngameAnchor, Ingameable},
toggle_button::ToggleButton,
tooltip::{Tooltip, Tooltipable, TooltipManager},
tooltip::{Tooltip, TooltipManager, Tooltipable},
};
use crate::{