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

fmt

Browse Source
This commit is contained in:
Isse 2023-01-28 03:08:20 +01:00
parent a5248bd61a
commit aefead4a31
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
voxygen/i18n-helpers/src/lib.rs
View File

@ -219,10 +219,6 @@ fn insert_alias(you: bool, info: PlayerInfo, localisation: &Localization) -> Str
(false, false) => info.player_alias, (false, false) => info.player_alias,
(false, true) => localisation.get_msg(YOU).to_string(), (false, true) => localisation.get_msg(YOU).to_string(),
(true, false) => format!("{}{}", MOD_SPACING, info.player_alias), (true, false) => format!("{}{}", MOD_SPACING, info.player_alias),
(true, true) => format!( (true, true) => format!("{}{}", MOD_SPACING, &localisation.get_msg(YOU),),
"{}{}",
MOD_SPACING,
&localisation.get_msg(YOU),
),
} }
} }

24
voxygen/src/hud/chat.rs
View File

@ -442,14 +442,26 @@ impl<'a> Widget for Chat<'a> {
} }
}) })
.map(|m| { .map(|m| {
let is_moderator = m.chat_type.uid().and_then(|uid| self.client.lookup_msg_context(&m).player_alias.get(&uid).map(|i| i.is_moderator)).unwrap_or(false); let is_moderator = m
.chat_type
.uid()
.and_then(|uid| {
self.client
.lookup_msg_context(&m)
.player_alias
.get(&uid)
.map(|i| i.is_moderator)
})
.unwrap_or(false);
(is_moderator, m) (is_moderator, m)
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let n_badges = messages.iter().filter(|t| t.0).count(); let n_badges = messages.iter().filter(|t| t.0).count();
if state.ids.chat_badges.len() < n_badges { if state.ids.chat_badges.len() < n_badges {
state.update(|s| { state.update(|s| {
s.ids.chat_badges.resize(n_badges, &mut ui.widget_id_generator()) s.ids
.chat_badges
.resize(n_badges, &mut ui.widget_id_generator())
}) })
} }
Rectangle::fill_with([CHAT_ICON_WIDTH, CHAT_BOX_HEIGHT], color::TRANSPARENT) Rectangle::fill_with([CHAT_ICON_WIDTH, CHAT_BOX_HEIGHT], color::TRANSPARENT)
@ -489,10 +501,10 @@ impl<'a> Widget for Chat<'a> {
// If the user is a moderator display a moderator icon with their alias. // If the user is a moderator display a moderator icon with their alias.
if *is_moderator { if *is_moderator {
Image::new(self.imgs.chat_moderator_badge) Image::new(self.imgs.chat_moderator_badge)
.w_h(CHAT_ICON_WIDTH, CHAT_ICON_HEIGHT) .w_h(CHAT_ICON_WIDTH, CHAT_ICON_HEIGHT)
.top_left_with_margins_on(item.widget_id, 2.0, 7.0) .top_left_with_margins_on(item.widget_id, 2.0, 7.0)
.parent(state.ids.message_box_bg) .parent(state.ids.message_box_bg)
.set(state.ids.chat_badges[badge_id], ui); .set(state.ids.chat_badges[badge_id], ui);
badge_id += 1; badge_id += 1;
} }