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

Browse Source
This commit is contained in:
voxal
2022-01-01 10:26:37 -08:00
parent 41e7e25f16
commit 471e75d846
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,10 +459,11 @@ impl<'a> Widget for Overhead<'a> {
} }
// Speech bubble // Speech bubble
// Only render if setting or other players // Only render if setting or other players
if !self.is_me || self.settings.speech_bubble_self { if !self.is_me || self.settings.speech_bubble_self {
if let Some(bubble) = self.bubble { if let Some(bubble) = self.bubble {
let dark_mode = self.settings.speech_bubble_dark_mode; let dark_mode = self.settings.speech_bubble_dark_mode;
let localizer = |s: &str, i| -> String { self.i18n.get_variation(s, i).to_string() }; let localizer =
|s: &str, i| -> String { self.i18n.get_variation(s, i).to_string() };
let bubble_contents: String = bubble.message(localizer); let bubble_contents: String = bubble.message(localizer);
let (text_color, shadow_color) = bubble_color(bubble, dark_mode); let (text_color, shadow_color) = bubble_color(bubble, dark_mode);
let mut text = Text::new(&bubble_contents) let mut text = Text::new(&bubble_contents)
@ -472,7 +473,7 @@ impl<'a> Widget for Overhead<'a> {
.up_from(state.ids.name, 26.0) .up_from(state.ids.name, 26.0)
.x_align_to(state.ids.name, Align::Middle) .x_align_to(state.ids.name, Align::Middle)
.parent(id); .parent(id);
if let Some(w) = text.get_w(ui) { if let Some(w) = text.get_w(ui) {
if w > MAX_BUBBLE_WIDTH { if w > MAX_BUBBLE_WIDTH {
text = text.w(MAX_BUBBLE_WIDTH); text = text.w(MAX_BUBBLE_WIDTH);
@ -570,14 +571,14 @@ impl<'a> Widget for Overhead<'a> {
}) })
.parent(id) .parent(id)
.mid_bottom_with_margin_on(state.ids.speech_bubble_text, -32.0); .mid_bottom_with_margin_on(state.ids.speech_bubble_text, -32.0);
if dark_mode { if dark_mode {
tail.w_h(22.0, 13.0) tail.w_h(22.0, 13.0)
} else { } else {
tail.w_h(22.0, 28.0) tail.w_h(22.0, 28.0)
} }
.set(state.ids.speech_bubble_tail, ui); .set(state.ids.speech_bubble_tail, ui);
let mut text_shadow = Text::new(&bubble_contents) let mut text_shadow = Text::new(&bubble_contents)
.color(shadow_color) .color(shadow_color)
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
@ -607,7 +608,6 @@ impl<'a> Widget for Overhead<'a> {
.set(state.ids.speech_bubble_icon, ui); .set(state.ids.speech_bubble_icon, ui);
} }
} }
} }
} }