Skip to content

Commit 416f304

Browse files
committed
feat: reverse the damage interaction details to show ship name normally and player name on hover
1 parent 5d99f25 commit 416f304

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

src/ui/replay_parser.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,6 @@ impl UiReport {
14911491
if interaction.1.damage_received == 0 {
14921492
continue;
14931493
}
1494-
let mut layout_job = LayoutJob::default();
14951494

14961495
let Some(interaction_player) = self.vehicle_reports().iter().find(|report| {
14971496
let player = report.vehicle().player().unwrap();
@@ -1501,16 +1500,16 @@ impl UiReport {
15011500
continue;
15021501
};
15031502

1503+
// Build hover text with clan tag and player name
1504+
let mut hover_layout = LayoutJob::default();
15041505
if let Some(clan_text) = interaction_player.clan_text() {
1505-
clan_text.clone().append_to(&mut layout_job, &style, egui::FontSelection::Default, egui::Align::Center);
1506-
layout_job.append(" ", 0.0, Default::default());
1506+
clan_text.clone().append_to(&mut hover_layout, &style, egui::FontSelection::Default, egui::Align::Center);
1507+
hover_layout.append(" ", 0.0, Default::default());
15071508
}
1509+
interaction_player.name_text.clone().append_to(&mut hover_layout, &style, egui::FontSelection::Default, egui::Align::Center);
15081510

1509-
interaction_player.name_text.clone().append_to(&mut layout_job, &style, egui::FontSelection::Default, egui::Align::Center);
1510-
1511-
layout_job.append(&format!(": {} ({})", interaction.1.damage_received_text, &interaction.1.damage_received_percentage_text), 0.0, Default::default());
1512-
1513-
ui.label(layout_job).on_hover_text(interaction_player.ship_name());
1511+
ui.label(format!("{}: {} ({})", interaction_player.ship_name(), interaction.1.damage_received_text, &interaction.1.damage_received_percentage_text))
1512+
.on_hover_text(hover_layout);
15141513
}
15151514
};
15161515
});
@@ -1534,7 +1533,6 @@ impl UiReport {
15341533
if interaction.1.damage_dealt == 0 {
15351534
continue;
15361535
}
1537-
let mut layout_job = LayoutJob::default();
15381536

15391537
let Some(interaction_player) = self.vehicle_reports().iter().find(|report| {
15401538
let player = report.vehicle().player().unwrap();
@@ -1544,16 +1542,16 @@ impl UiReport {
15441542
continue;
15451543
};
15461544

1545+
// Build hover text with clan tag and player name
1546+
let mut hover_layout = LayoutJob::default();
15471547
if let Some(clan_text) = interaction_player.clan_text() {
1548-
clan_text.clone().append_to(&mut layout_job, &style, egui::FontSelection::Default, egui::Align::Center);
1549-
layout_job.append(" ", 0.0, Default::default());
1548+
clan_text.clone().append_to(&mut hover_layout, &style, egui::FontSelection::Default, egui::Align::Center);
1549+
hover_layout.append(" ", 0.0, Default::default());
15501550
}
1551+
interaction_player.name_text.clone().append_to(&mut hover_layout, &style, egui::FontSelection::Default, egui::Align::Center);
15511552

1552-
interaction_player.name_text.clone().append_to(&mut layout_job, &style, egui::FontSelection::Default, egui::Align::Center);
1553-
1554-
layout_job.append(&format!(": {} ({})", interaction.1.damage_dealt_text, &interaction.1.damage_dealt_percentage_text), 0.0, Default::default());
1555-
1556-
ui.label(layout_job).on_hover_text(interaction_player.ship_name());
1553+
ui.label(format!("{}: {} ({})", interaction_player.ship_name(), interaction.1.damage_dealt_text, &interaction.1.damage_dealt_percentage_text))
1554+
.on_hover_text(hover_layout);
15571555
}
15581556
};
15591557
});

0 commit comments

Comments
 (0)