Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-27 20:34:03 +00:00
Code Issues Activity

Fixes to notifications

Browse source
This commit is contained in:
jugeeya 2023-09-11 18:02:10 -07:00
parent 243bbf470d
commit 04c84f466a
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/training/ui/display.rs
View file

@ -25,7 +25,7 @@ pub unsafe fn draw(root_pane: &Pane) {
let notification_idx = 0; let notification_idx = 0;
let queue = &mut ui::notifications::QUEUE; let queue = &mut ui::notifications::QUEUE;
let notification = queue.first(); let notification = queue.first_mut();
root_pane root_pane
.find_pane_by_name_recursive(display_parent_fmt!(notification_idx)) .find_pane_by_name_recursive(display_parent_fmt!(notification_idx))
@ -38,21 +38,23 @@ pub unsafe fn draw(root_pane: &Pane) {
let notification = notification.unwrap(); let notification = notification.unwrap();
let color = notification.color; let color = notification.color;
root_pane if !notification.has_drawn() {
.find_pane_by_name_recursive(display_header_fmt!(notification_idx)) notification.set_drawn();
.unwrap() root_pane
.as_textbox() .find_pane_by_name_recursive(display_header_fmt!(notification_idx))
.set_text_string(&notification.header); .unwrap()
.as_textbox()
.set_text_string(&notification.header);
let text = root_pane let text = root_pane
.find_pane_by_name_recursive(display_txt_fmt!(notification_idx)) .find_pane_by_name_recursive(display_txt_fmt!(notification_idx))
.unwrap() .unwrap()
.as_textbox(); .as_textbox();
text.set_text_string(&notification.message); text.set_text_string(&notification.message);
text.set_default_material_colors(); text.set_default_material_colors();
text.set_color(color.r, color.g, color.b, color.a); text.set_color(color.r, color.g, color.b, color.a);
}
let notification = queue.first_mut().unwrap();
let has_completed = notification.check_completed(); let has_completed = notification.check_completed();
if has_completed { if has_completed {
queue.remove(0); queue.remove(0);

10
src/training/ui/notifications.rs
View file

@ -8,6 +8,7 @@ pub struct Notification {
pub message: String, pub message: String,
length: u32, length: u32,
pub color: ResColor, pub color: ResColor,
has_drawn: bool,
} }
impl Notification { impl Notification {
@ -17,9 +18,18 @@ impl Notification {
message, message,
length, length,
color, color,
has_drawn: false,
} }
} }
pub fn set_drawn(&mut self) {
self.has_drawn = true;
}
pub fn has_drawn(&mut self) -> bool {
self.has_drawn
}
pub fn tick(&mut self) { pub fn tick(&mut self) {
self.length -= 1; self.length -= 1;
} }