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

Move variables closer to usage in 'buttons' file

Browse Source
This commit is contained in:
Dr. Dystopia 2021-08-01 21:59:09 +02:00
parent 1bb9a9e315
commit dffc91045e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/hud/buttons.rs
View File

@ -126,13 +126,7 @@ impl<'a> Widget for Buttons<'a> {
fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event { fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event {
common_base::prof_span!("Buttons::update"); common_base::prof_span!("Buttons::update");
let widget::UpdateArgs { state, ui, .. } = args; let widget::UpdateArgs { state, ui, .. } = args;
let invs = self.client.inventories();
let inventory = match invs.get(self.client.entity()) {
Some(inv) => inv,
None => return None,
};
let localized_strings = self.localized_strings; let localized_strings = self.localized_strings;
let arrow_ani = (self.pulse * 4.0/* speed factor */).cos() * 0.5 + 0.8; //Animation timer
let button_tooltip = Tooltip::new({ let button_tooltip = Tooltip::new({
// Edge images [t, b, r, l] // Edge images [t, b, r, l]
@ -197,6 +191,11 @@ impl<'a> Widget for Buttons<'a> {
state.ids.bag_text, state.ids.bag_text,
); );
} }
let invs = self.client.inventories();
let inventory = match invs.get(self.client.entity()) {
Some(inv) => inv,
None => return None,
};
if !self.show_bag { if !self.show_bag {
let space_used = inventory.populated_slots(); let space_used = inventory.populated_slots();
let space_max = inventory.slots().count(); let space_max = inventory.slots().count();
@ -357,6 +356,7 @@ impl<'a> Widget for Buttons<'a> {
} }
// Unspent SP indicator // Unspent SP indicator
if unspent_sp { if unspent_sp {
let arrow_ani = (self.pulse * 4.0/* speed factor */).cos() * 0.5 + 0.8; //Animation timer
Image::new(self.imgs.sp_indicator_arrow) Image::new(self.imgs.sp_indicator_arrow)
.w_h(20.0, 11.0) .w_h(20.0, 11.0)
.graphics_for(state.ids.spellbook_button) .graphics_for(state.ids.spellbook_button)