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

review

Browse Source
This commit is contained in:
juliancoffee 2024-01-16 13:07:53 +02:00
parent 7228543fbf
commit db569513f3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,18 +737,17 @@ impl<'a> Widget for Crafting<'a> {
.press_image(self.imgs.selection_press)
.image_color(color::rgba(1.0, 0.82, 0.27, 1.0));
let borrow_check;
let title;
let recipe_name =
if let Some((_recipe, pseudo_name, _filter_tab)) = pseudo_entries.get(name) {
*pseudo_name
} else {
let (title, _) = util::item_text(
(title, _) = util::item_text(
recipe.output.0.as_ref(),
self.localized_strings,
self.item_l10n,
);
borrow_check = title;
&borrow_check
&title
};
let text = Text::new(recipe_name)
@ -865,20 +864,21 @@ impl<'a> Widget for Crafting<'a> {
None => None,
} {
let recipe_name = String::from(recipe_name);
let borrow_check;
let title;
let title = if let Some((_recipe, pseudo_name, _filter_tab)) =
pseudo_entries.get(&recipe_name)
{
*pseudo_name
} else {
let (title, _) = util::item_text(
(title, _) = util::item_text(
recipe.output.0.as_ref(),
self.localized_strings,
self.item_l10n,
);
borrow_check = title;
&borrow_check
&title
};
// Title
Text::new(title)
.mid_top_with_margin_on(state.ids.align_ing, -22.0)

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

@ -15,7 +15,7 @@ use common::{
};
use conrod_core::image;
use i18n::{fluent_args, Localization};
use std::{borrow::Cow, fmt::Write, num::NonZeroU32};
use std::{borrow::Cow, fmt::Write};
pub fn price_desc<'a>(
prices: &Option<SitePrices>,
@ -79,7 +79,7 @@ pub fn describe<'a, I: ItemDesc + ?Sized>(
let (title, _) = item_text(item, i18n, l10n_spec);
let amount = item.amount();
if amount > NonZeroU32::new(1).unwrap() {
if amount.get() > 1 {
format!("{amount} x {title}")
} else {
title