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

cargo fmt, also remove a stray <<<<HEAD thing

Browse Source 
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
This commit is contained in:
Yeedo 2019-04-29 22:23:31 +01:00
parent 164feaa616
commit f1e268986b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
voxygen/src/hud/mod.rs
View File

@ -2,7 +2,7 @@ mod chat;
use crate::{ use crate::{
render::Renderer, render::Renderer,
settings::{Settings, ControlSettings}, settings::{ControlSettings, Settings},
ui::{self, ScaleMode, ToggleButton, Ui}, ui::{self, ScaleMode, ToggleButton, Ui},
window::{Event as WinEvent, Key, Window}, window::{Event as WinEvent, Key, Window},
GlobalState, GlobalState,
@ -1025,11 +1025,7 @@ impl Hud {
.press_images(self.imgs.bag_press, self.imgs.bag_open_press) .press_images(self.imgs.bag_press, self.imgs.bag_open_press)
.w_h(420.0 / 10.0, 480.0 / 10.0) .w_h(420.0 / 10.0, 480.0 / 10.0)
.set(self.ids.bag, ui_widgets); .set(self.ids.bag, ui_widgets);
<<<<<<< HEAD Text::new(&format!("{:?}", self.settings.controls.bag))
Text::new(&format!("{:?}", self.settings.controls.bag))
=======
Text::new("B")
>>>>>>> 4be2d5d8f791addfbeaab680d1699c4684069825
.bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0) .bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0)
.font_size(10) .font_size(10)
.font_id(self.font_metamorph) .font_id(self.font_metamorph)
@ -1891,7 +1887,7 @@ impl Hud {
WinEvent::SettingsChanged => { WinEvent::SettingsChanged => {
self.settings = global_state.settings.clone(); self.settings = global_state.settings.clone();
true true
}, }
_ => false, _ => false,
} }
} }
@ -1929,6 +1925,7 @@ fn get_help_text(cs: &ControlSettings) -> String {
format!("{:?} = Character window\n", cs.character_window), format!("{:?} = Character window\n", cs.character_window),
format!("{:?} = Social\n", cs.social), format!("{:?} = Social\n", cs.social),
format!("{:?} = Spellbook\n", cs.spellbook), format!("{:?} = Spellbook\n", cs.spellbook),
format!("{:?} = Settings\n", cs.settings) format!("{:?} = Settings\n", cs.settings),
].concat() ]
} .concat()
}