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

stack numbers

Browse Source
This commit is contained in:
Pfauenauge90 2020-03-19 19:33:59 +01:00
parent e16bb66fb3
commit 3c0e070ed0
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/comp/inventory/mod.rs
View File

@ -277,7 +277,7 @@ impl Inventory {
impl Default for Inventory {
fn default() -> Inventory {
let mut inventory = Inventory {
slots: vec![None; 25],
slots: vec![None; 27],
};
inventory.push(assets::load_expect_cloned("common.items.cheese"));
inventory.push(assets::load_expect_cloned("common.items.apple"));

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

@ -145,10 +145,8 @@ pub enum Event {
Close,
}
#[const_tweaker::tweak(min = -10.0, max = 10.0, step = 1.0)]
const X: f64 = 0.0;
#[const_tweaker::tweak(min = -10.0, max = 10.0, step = 1.0)]
const Y: f64 = 0.0;
//#[const_tweaker::tweak(min = -10.0, max = 10.0, step = 1.0)]
//const X: f64 = 10.0;
impl<'a> Widget for Bag<'a> {
type Event = Option<Event>;
@ -690,19 +688,19 @@ impl<'a> Widget for Bag<'a> {
| ItemKind::Consumable { amount, .. }
| ItemKind::Ingredient { amount, .. } => Some(amount),
} {
if amount > 0 {
// TODO This should be > 1
if amount > 1 {
Text::new(&format!("{}", &amount))
.top_right_with_margins_on(state.ids.items[i], *Y, *X)
.top_right_with_margins_on(state.ids.items[i], -4.0, 0.0)
.font_id(self.fonts.cyri.conrod_id)
.font_size(self.fonts.cyri.scale(14))
.floating(true)
.font_size(self.fonts.cyri.scale(12))
.color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
.floating(true)
.set(state.ids.amounts_bg[i], ui);
Text::new(&format!("{}", &amount))
.bottom_left_with_margins_on(state.ids.amounts_bg[i], 2.0, 2.0)
.font_id(self.fonts.cyri.conrod_id)
.font_size(self.fonts.cyri.scale(10))
.font_size(self.fonts.cyri.scale(12))
.color(TEXT_COLOR)
.floating(true)
.set(state.ids.amounts[i], ui);