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

Merge branch 'UMR1352/fix#788' into 'master'

Browse Source 
Fix issue #788

Closes #788

See merge request veloren/veloren!1432
This commit is contained in:
Marcel 2020-10-16 12:17:49 +00:00
commit f6692aee74
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/hud/crafting.rs
View File

@ -393,7 +393,7 @@ impl<'a> Widget for Crafting<'a> {
for (i, (item_def, amount)) in recipe.inputs.iter().enumerate() {
// Grey color for images and text if their amount is too low to craft the item
let item_count_in_inventory = self.inventory.item_count(item_def);
let col = if item_count_in_inventory >= u64::from(*amount) {
let col = if item_count_in_inventory >= u64::from(*amount.max(&1)) {
TEXT_COLOR
} else {
TEXT_DULL_RED_COLOR
@ -459,7 +459,7 @@ impl<'a> Widget for Crafting<'a> {
.down_from(state.ids.ingredient_frame[i - 1], 20.0)
.font_id(self.fonts.cyri.conrod_id)
.font_size(self.fonts.cyri.scale(14))
.color(col)
.color(TEXT_COLOR)
.set(state.ids.req_text[i], ui);
Text::new(&item_def.name())
.right_from(state.ids.ingredient_frame[i], 10.0)