From 9aacc33495ac59cf1561c10bf9b9881e61b4daff Mon Sep 17 00:00:00 2001
From: juliancoffee <lightdarkdaughter@gmail.com>
Date: Sun, 22 Aug 2021 21:10:52 +0300
Subject: [PATCH] Inline create_new_text

---
 voxygen/src/hud/diary.rs | 70 ++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs
index 93d7b3d1bb..3430ea7f51 100644
--- a/voxygen/src/hud/diary.rs
+++ b/voxygen/src/hud/diary.rs
@@ -260,9 +260,7 @@ impl<'a> Widget for Diary<'a> {
 
     fn update(mut self, args: widget::UpdateArgs<Self>) -> Self::Event {
         common_base::prof_span!("Diary::update");
-        let widget::UpdateArgs {
-            state, ui, ..
-        } = args;
+        let widget::UpdateArgs { state, ui, .. } = args;
         let mut events = Vec::new();
 
         // Tooltips
@@ -319,14 +317,12 @@ impl<'a> Widget for Diary<'a> {
         }
 
         // Title
-        self.create_new_text(
-            self.localized_strings.get("hud.diary"),
-            state.frame,
-            3.0,
-            29,
-            TEXT_COLOR,
-        )
-        .set(state.title, ui);
+        Text::new(self.localized_strings.get("hud.diary"))
+            .mid_top_with_margin_on(state.frame, 3.0)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(29))
+            .color(TEXT_COLOR)
+            .set(state.title, ui);
 
         // Content Alignment
         Rectangle::fill_with([599.0 * 2.0, 419.0 * 2.0], color::TRANSPARENT)
@@ -486,26 +482,35 @@ impl<'a> Widget for Diary<'a> {
             .mouse()
             .map_or(false, |m| m.is_over())
         {
-            self.create_new_text(&exp_txt, state.exp_bar_frame, 47.0, 14, TEXT_COLOR)
+            Text::new(&exp_txt)
+                .mid_top_with_margin_on(state.exp_bar_frame, 47.0)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(14))
+                .color(TEXT_COLOR)
                 .graphics_for(state.exp_bar_frame)
                 .set(state.exp_bar_txt, ui);
         }
-        self.create_new_text(&rank_txt, state.exp_bar_frame, 5.0, 28, TEXT_COLOR)
+        Text::new(&rank_txt)
+            .mid_top_with_margin_on(state.exp_bar_frame, 5.0)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(28))
+            .color(TEXT_COLOR)
             .set(state.exp_bar_rank, ui);
-        self.create_new_text(
+
+        Text::new(
             &self
                 .localized_strings
                 .get("hud.skill.sp_available")
                 .replace("{number}", &available_pts_txt),
-            state.content_align,
-            700.0,
-            28,
-            if available_pts > 0 {
-                Color::Rgba(0.92, 0.76, 0.0, frame_ani)
-            } else {
-                TEXT_COLOR
-            },
         )
+        .mid_top_with_margin_on(state.content_align, 700.0)
+        .font_id(self.fonts.cyri.conrod_id)
+        .font_size(self.fonts.cyri.scale(28))
+        .color(if available_pts > 0 {
+            Color::Rgba(0.92, 0.76, 0.0, frame_ani)
+        } else {
+            TEXT_COLOR
+        })
         .set(state.available_pts_txt, ui);
         let tree_title = match sel_tab {
             SelectedSkillTree::General => self.localized_strings.get("common.weapons.general"),
@@ -532,7 +537,11 @@ impl<'a> Widget for Diary<'a> {
             },
             _ => "Unknown",
         };
-        self.create_new_text(tree_title, state.content_align, 2.0, 34, TEXT_COLOR)
+        Text::new(tree_title)
+            .mid_top_with_margin_on(state.content_align, 2.0)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(34))
+            .color(TEXT_COLOR)
             .set(state.tree_title_txt, ui);
         // Skill Trees
         // Alignment Placing
@@ -2142,21 +2151,6 @@ fn format_skill_description<'a>(
 }
 
 impl<'a> Diary<'a> {
-    fn create_new_text<'b>(
-        &mut self,
-        text: &'b str,
-        state: widget::Id,
-        margin: f64,
-        scale: u32,
-        color: Color,
-    ) -> Text<'b> {
-        Text::new(text)
-            .mid_top_with_margin_on(state, margin)
-            .font_id(self.fonts.cyri.conrod_id)
-            .font_size(self.fonts.cyri.scale(scale))
-            .color(color)
-    }
-
     fn create_unlock_skill_button(
         &mut self,
         skill: Skill,