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

Modular inputs now have tooltips.

Browse Source
This commit is contained in:
Sam
2022-01-04 12:20:51 -05:00
parent af50864643
commit aeac0f5ad6
1 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,11 +809,42 @@ impl<'a> Widget for Crafting<'a> {
required_amount: 1, required_amount: 1,
}; };
slot_maker let primary_slot_widget = slot_maker
.fabricate(primary_slot, [40.0; 2]) .fabricate(primary_slot, [40.0; 2])
.top_left_with_margins_on(state.ids.modular_art, 4.0, 4.0) .top_left_with_margins_on(state.ids.modular_art, 4.0, 4.0)
.parent(state.ids.align_ing) .parent(state.ids.align_ing);
.set(state.ids.modular_inputs[0], ui);
if let Some(slot) = primary_slot.invslot {
if let Some(item) = self.inventory.get(slot) {
primary_slot_widget
.with_item_tooltip(
self.item_tooltip_manager,
core::iter::once(item as &dyn ItemDesc),
&None,
&item_tooltip,
)
.set(state.ids.modular_inputs[0], ui);
} else {
primary_slot_widget.set(state.ids.modular_inputs[0], ui);
}
} else {
primary_slot_widget.set(state.ids.modular_inputs[0], ui);
}
// Not sure why it doesn't work, maybe revisit later?
// if let Some(item) = primary_slot.invslot.and_then(|slot|
// self.inventory.get(slot)) { primary_slot_widget
// .with_item_tooltip(
// self.item_tooltip_manager,
// core::iter::once(item as &dyn ItemDesc),
// &None,
// &item_tooltip,
// )
// .set(state.ids.modular_inputs[0], ui);
// } else {
// primary_slot_widget
// .set(state.ids.modular_inputs[0], ui);
// }
let secondary_slot = CraftSlot { let secondary_slot = CraftSlot {
index: 1, index: 1,
@ -831,11 +862,41 @@ impl<'a> Widget for Crafting<'a> {
required_amount: 1, required_amount: 1,
}; };
slot_maker let secondary_slot_widget = slot_maker
.fabricate(secondary_slot, [40.0; 2]) .fabricate(secondary_slot, [40.0; 2])
.top_right_with_margins_on(state.ids.modular_art, 4.0, 4.0) .top_right_with_margins_on(state.ids.modular_art, 4.0, 4.0)
.parent(state.ids.align_ing) .parent(state.ids.align_ing);
.set(state.ids.modular_inputs[1], ui);
if let Some(slot) = secondary_slot.invslot {
if let Some(item) = self.inventory.get(slot) {
secondary_slot_widget
.with_item_tooltip(
self.item_tooltip_manager,
core::iter::once(item as &dyn ItemDesc),
&None,
&item_tooltip,
)
.set(state.ids.modular_inputs[1], ui);
} else {
secondary_slot_widget.set(state.ids.modular_inputs[1], ui);
}
} else {
secondary_slot_widget.set(state.ids.modular_inputs[1], ui);
}
// if let Some(item) = secondary_slot.invslot.and_then(|slot|
// self.inventory.get(slot)) { secondary_slot_widget
// .with_item_tooltip(
// self.item_tooltip_manager,
// core::iter::once(item as &dyn ItemDesc),
// &None,
// &item_tooltip,
// )
// .set(state.ids.modular_inputs[1], ui);
// } else {
// secondary_slot_widget
// .set(state.ids.modular_inputs[1], ui);
// }
let can_perform = let can_perform =
primary_slot.invslot.is_some() && secondary_slot.invslot.is_some(); primary_slot.invslot.is_some() && secondary_slot.invslot.is_some();