hodasemi/rpg_base
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity Actions

Try to solve tool tip disabling

Browse source
This commit is contained in:
hodasemi 2025-03-06 17:30:50 +01:00
parent adda066782
commit e2eb7e8722
6 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
character_window/src/abilities/ability_right_side.rs
View file

@ -106,7 +106,7 @@ impl<A: Ability + 'static> AbilityPageRightSide<A> {
menu.add_tooltip("active_ability", gui);
}
} else {
menu.remove_tooltip("active_ability");
menu.remove_tooltip(world, "active_ability")?;
}
}

6
character_window/src/abilities/content.rs
View file

@ -124,7 +124,7 @@ impl<A: Ability + 'static> ContentUpdate for Content<A, AbilityAddon> {
} else {
let window = reference.upgrade().unwrap();
window.remove_tooltip(format!("addon_{index}"));
window.remove_tooltip(world, format!("addon_{index}"))?;
}
Ok(())
@ -275,8 +275,8 @@ impl<A: Ability + 'static> ContentUpdate for Content<A, AbilityBook<A>> {
} else {
let window = reference.upgrade().unwrap();
window.remove_tooltip(format!("book_{index}"));
window.remove_tooltip("active_book");
window.remove_tooltip(world, format!("book_{index}"))?;
window.remove_tooltip(world, "active_book")?;
}
Ok(())

6
character_window/src/inventory/content.rs
View file

@ -217,8 +217,8 @@ impl<A: Ability + 'static> ContentUpdate for Content<A, Item> {
} else {
let window = reference.upgrade().unwrap();
window.remove_tooltip(format!("item_{index}"));
window.remove_tooltip("equip");
window.remove_tooltip(world, format!("item_{index}"))?;
window.remove_tooltip(world, "equip")?;
}
Ok(())
@ -337,7 +337,7 @@ impl<A: Ability + 'static> ContentUpdate for Content<A, Jewel> {
} else {
let window = reference.upgrade().unwrap();
window.remove_tooltip(format!("jewel_{index}"));
window.remove_tooltip(world, format!("jewel_{index}"))?;
}
Ok(())

8
character_window/src/inventory/item_right_side.rs
View file

@ -211,11 +211,11 @@ mod macros {
reference.upgrade().unwrap().add_tooltip("equip", gui);
}
None => {
reference.upgrade().unwrap().remove_tooltip("equip");
reference.upgrade().unwrap().remove_tooltip(world, "equip")?;
}
}
} else {
reference.upgrade().unwrap().remove_tooltip("equip");
reference.upgrade().unwrap().remove_tooltip(world, "equip")?;
}
Ok(())
@ -346,11 +346,11 @@ mod macros {
reference.upgrade().unwrap().add_tooltip("equip", gui);
}
None => {
reference.upgrade().unwrap().remove_tooltip("equip");
reference.upgrade().unwrap().remove_tooltip(world, "equip")?;
}
}
} else {
reference.upgrade().unwrap().remove_tooltip("equip");
reference.upgrade().unwrap().remove_tooltip(world, "equip")?;
}
Ok(())

4
character_window/src/inventory/jewel_right_side.rs
View file

@ -120,7 +120,7 @@ impl JewelRightSide {
menu.add_tooltip("upper", tooltip);
}
} else {
menu.remove_tooltip("upper");
menu.remove_tooltip(world, "upper")?;
}
Ok(())
@ -163,7 +163,7 @@ impl JewelRightSide {
menu.add_tooltip(format!("lower_{index}",), tooltip);
}
} else {
menu.remove_tooltip(format!("lower_{index}"));
menu.remove_tooltip(world, format!("lower_{index}"))?;
}
Ok(())

8
character_window/src/lib.rs
View file

@ -234,8 +234,12 @@ impl CharacterWindow {
.insert(name.to_string(), gui.into());
}
pub fn remove_tooltip(&self, name: impl ToString) {
self.tooltips.lock().unwrap().remove(&name.to_string());
pub fn remove_tooltip(&self, world: &mut World, name: impl ToString) -> Result<()> {
if let Some(tooltip) = self.tooltips.lock().unwrap().remove(&name.to_string()) {
tooltip.disable(world)?;
}
Ok(())
}
pub fn salvage_from_inventory<A, F, S>(world: &mut World, hero: Entity, f: F) -> Result<()>