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

Extract 'create_ text_with_margin' function from 'update'

Browse Source
This commit is contained in:
Dr. Dystopia 2021-06-26 14:54:06 +02:00
parent f983295318
commit 04d5555e98
1 changed files with 100 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
voxygen/src/hud/group.rs
View File

@ -25,7 +25,7 @@ use conrod_core::{
color, color,
position::{Place, Relative}, position::{Place, Relative},
widget::{self, Button, Image, Rectangle, Scrollbar, Text}, widget::{self, Button, Image, Rectangle, Scrollbar, Text},
widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon, widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, UiCell, Widget, WidgetCommon,
}; };
use specs::{saveload::MarkerAllocator, WorldExt}; use specs::{saveload::MarkerAllocator, WorldExt};
@ -263,18 +263,26 @@ impl<'a> Widget for Group<'a> {
{ {
self.show.group_menu = !self.show.group_menu; self.show.group_menu = !self.show.group_menu;
}; };
Text::new(&group_name) self.create_text_with_margin(
.up_from(state.ids.group_button, 5.0) ui,
.font_size(14) TextEnum::UpFrom,
.font_id(self.fonts.cyri.conrod_id) BLACK,
.color(BLACK) state.ids.title_bg,
.set(state.ids.title_bg, ui); &group_name,
Text::new(&group_name) 14,
.bottom_right_with_margins_on(state.ids.title_bg, 1.0, 1.0) 0.0,
.font_size(14) state.ids.group_button,
.font_id(self.fonts.cyri.conrod_id) );
.color(TEXT_COLOR) self.create_text_with_margin(
.set(state.ids.title, ui); ui,
TextEnum::BottomRightWithMarginsOn,
TEXT_COLOR,
state.ids.title,
&group_name,
14,
0.0,
state.ids.title_bg,
);
// Member panels // Member panels
let group_size = group_members.len(); let group_size = group_members.len();
if state.ids.member_panels_bg.len() < group_size { if state.ids.member_panels_bg.len() < group_size {
@ -421,12 +429,16 @@ impl<'a> Widget for Group<'a> {
} }
if health.is_dead { if health.is_dead {
// Death Text // Death Text
Text::new(&self.localized_strings.get("hud.group.dead")) self.create_text_with_margin(
.mid_top_with_margin_on(state.ids.member_panels_bg[i], 1.0) ui,
.font_size(20) TextEnum::MidTopWithMarginOn,
.font_id(self.fonts.cyri.conrod_id) KILL_COLOR,
.color(KILL_COLOR) state.ids.dead_txt[i],
.set(state.ids.dead_txt[i], ui); self.localized_strings.get("hud.group.dead"),
20,
1.0,
state.ids.member_panels_bg[i],
);
} else { } else {
// Health Text // Health Text
let txt = format!( let txt = format!(
@ -448,12 +460,16 @@ impl<'a> Widget for Group<'a> {
10000..=99999 => 5.0, 10000..=99999 => 5.0,
_ => 5.5, _ => 5.5,
}; };
Text::new(&txt) self.create_text_with_margin(
.mid_top_with_margin_on(state.ids.member_panels_bg[i], txt_offset) ui,
.font_size(font_size) TextEnum::MidTopWithMarginOn,
.font_id(self.fonts.cyri.conrod_id) Color::Rgba(1.0, 1.0, 1.0, 0.5),
.color(Color::Rgba(1.0, 1.0, 1.0, 0.5)) state.ids.health_txt[i],
.set(state.ids.health_txt[i], ui); &txt,
font_size,
txt_offset,
state.ids.member_panels_bg[i],
);
}; };
// Panel Frame // Panel Frame
@ -583,12 +599,16 @@ impl<'a> Widget for Group<'a> {
}); });
} else { } else {
// Values N.A. // Values N.A.
Text::new(&stats.name.to_string()) self.create_text_with_margin(
.top_left_with_margins_on(state.ids.member_panels_frame[i], -22.0, 0.0) ui,
.font_size(20) TextEnum::TopLeftWithMarginsOn,
.font_id(self.fonts.cyri.conrod_id) GROUP_COLOR,
.color(GROUP_COLOR) state.ids.member_panels_txt[i],
.set(state.ids.member_panels_txt[i], ui); &stats.name.to_string(),
20,
0.0,
state.ids.member_panels_frame[i],
);
let back = if i == 0 { let back = if i == 0 {
Image::new(self.imgs.member_bg) Image::new(self.imgs.member_bg)
.top_left_with_margins_on(ui.window, offset, 20.0) .top_left_with_margins_on(ui.window, offset, 20.0)
@ -606,12 +626,16 @@ impl<'a> Widget for Group<'a> {
.color(Some(UI_HIGHLIGHT_0)) .color(Some(UI_HIGHLIGHT_0))
.set(state.ids.member_panels_frame[i], ui); .set(state.ids.member_panels_frame[i], ui);
// Panel Text // Panel Text
Text::new(&self.localized_strings.get("hud.group.out_of_range")) self.create_text_with_margin(
.mid_top_with_margin_on(state.ids.member_panels_bg[i], 3.0) ui,
.font_size(16) TextEnum::MidTopWithMarginOn,
.font_id(self.fonts.cyri.conrod_id) TEXT_COLOR,
.color(TEXT_COLOR) state.ids.dead_txt[i],
.set(state.ids.dead_txt[i], ui); self.localized_strings.get("hud.group.out_of_range"),
16,
3.0,
state.ids.member_panels_frame[i],
);
} }
} }
} }
@ -856,3 +880,42 @@ impl<'a> Widget for Group<'a> {
events events
} }
} }
enum TextEnum {
UpFrom,
BottomRightWithMarginsOn,
MidTopWithMarginOn,
TopLeftWithMarginsOn,
}
impl<'a> Group<'a> {
fn create_text_with_margin(
&self,
ui: &mut UiCell,
text_enum: TextEnum,
color: Color,
id: conrod_core::widget::id::Id,
string: &str,
font_size: u32,
margin: f64,
other: conrod_core::widget::id::Id,
) {
let mut text = Text::new(string);
match text_enum {
TextEnum::UpFrom => text = text.up_from(other, 5.0),
TextEnum::BottomRightWithMarginsOn => {
text = text.bottom_right_with_margins_on(other, 1.0, 1.0)
},
TextEnum::MidTopWithMarginOn => text = text.mid_top_with_margin_on(other, margin),
TextEnum::TopLeftWithMarginsOn => {
text = text.top_left_with_margins_on(other, -22.0, 0.0)
},
};
text.font_size(font_size)
.font_id(self.fonts.cyri.conrod_id)
.color(color)
.set(id, ui);
}
}