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

fixed merging issue, tooltip descriptions colour

Browse Source
This commit is contained in:
Pfauenauge90 2019-09-26 16:00:24 +02:00
parent 3a8b146687
commit 1a2b32b44b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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, Tooltipable};
use crate::ui::{ImageFrame, Tooltip, TooltipManager, Tooltipable};
use client::Client;
use conrod_core::{
color,
@ -113,7 +113,7 @@ impl<'a> Widget for Bag<'a> {
.title_font_size(15)
.desc_font_size(10)
.title_text_color(TEXT_COLOR)
.desc_text_color(TEXT_COLOR_2);
.desc_text_color(TEXT_COLOR);
// Bag parts
Image::new(self.imgs.bag_bot)
@ -187,7 +187,7 @@ impl<'a> Widget for Bag<'a> {
&item.description(),
&item.category(),
&item_tooltip,
)
)
.set(state.ids.inv_slots[i], ui)
} else {
slot_widget.set(state.ids.inv_slots[i], ui)