From ee42eaa515a1740964d3fb4caada918d2fbe9b49 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Thu, 30 Sep 2021 02:44:16 -0400
Subject: [PATCH] Make gitlab hightlight syntax for ron files (using rust
 syntax highlighting). Update changelog for credits addition. Fix clippy large
 variant issue.

---
 .gitattributes                  |  2 ++
 CHANGELOG.md                    |  1 +
 voxygen/src/menu/main/ui/mod.rs | 10 +++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 3e4661f797..9b9dc79491 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,5 @@
 *.ico filter=lfs diff=lfs merge=lfs -text
 *.tar filter=lfs diff=lfs merge=lfs -text
 assets/world/map/*.bin filter=lfs diff=lfs merge=lfs -text
+
+*.ron gitlab-language=rust
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb375711c..9fdaf58bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added a setting to always show health and energy bars
 - Added a crafting station icon to the crafting menu sidebar for items that could be crafted at a crafting station
 - Added a setting to disable the hotkey hints
+- Added a credits screen in the main menu which shows attributions for assets
 
 ### Changed
 
diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index ee23c541c1..fee8c40660 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -107,7 +107,7 @@ enum Screen {
         screen: credits::Screen,
     },
     Login {
-        screen: login::Screen,
+        screen: Box<login::Screen>, // boxed to avoid large variant
         // Error to display in a box
         error: Option<String>,
     },
@@ -186,7 +186,7 @@ impl Controls {
             }
         } else { */
             Screen::Login {
-                screen: login::Screen::new(),
+                screen: Box::new(login::Screen::new()),
                 error: None,
             };
         //};
@@ -334,7 +334,7 @@ impl Controls {
             Message::Quit => events.push(Event::Quit),
             Message::Back => {
                 self.screen = Screen::Login {
-                    screen: login::Screen::new(),
+                    screen: Box::new(login::Screen::new()),
                     error: None,
                 };
             },
@@ -431,7 +431,7 @@ impl Controls {
     fn exit_connect_screen(&mut self) {
         if matches!(&self.screen, Screen::Connecting { .. }) {
             self.screen = Screen::Login {
-                screen: login::Screen::new(),
+                screen: Box::new(login::Screen::new()),
                 error: None,
             }
         }
@@ -457,7 +457,7 @@ impl Controls {
     fn connection_error(&mut self, error: String) {
         if matches!(&self.screen, Screen::Connecting { .. }) {
             self.screen = Screen::Login {
-                screen: login::Screen::new(),
+                screen: Box::new(login::Screen::new()),
                 error: Some(error),
             }
         }