From ff769f86320b70b61f3898bb5cb2fb582bda7b8b Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 8 May 2022 06:46:37 -0500
Subject: [PATCH] Add titlebar to newchar GUI + disable titlebar on others

---
 scripts/client/gui/changepass.js |  1 +
 scripts/client/gui/login.js      |  1 +
 scripts/client/gui/newchar.js    | 16 ++++++++--------
 scripts/client/gui/register.js   |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/client/gui/changepass.js b/scripts/client/gui/changepass.js
index b95a4b22..7a7ba834 100644
--- a/scripts/client/gui/changepass.js
+++ b/scripts/client/gui/changepass.js
@@ -38,6 +38,7 @@ function initChangePasswordGUI() {
 	});
 	passwordChange.window.titleBarIconSize = toVector2(0,0);
 	passwordChange.window.titleBarHeight = 0;
+	passwordChange.window.titleBarShown = false;
 
 	passwordChange.window.image(85, -10, 140, 140, mainLogoPath, {
 		focused: {
diff --git a/scripts/client/gui/login.js b/scripts/client/gui/login.js
index e98e3929..ab68c6ee 100644
--- a/scripts/client/gui/login.js
+++ b/scripts/client/gui/login.js
@@ -62,6 +62,7 @@ function initLoginGUI() {
 	});
 	login.window.titleBarIconSize = toVector2(0,0);
 	login.window.titleBarHeight = 0;
+	login.window.titleBarShown = false;
 
 	login.logoImage = login.window.image(100, 20, 100, 100, mainLogoPath, {
 		focused: {
diff --git a/scripts/client/gui/newchar.js b/scripts/client/gui/newchar.js
index 682dad8a..945c5600 100644
--- a/scripts/client/gui/newchar.js
+++ b/scripts/client/gui/newchar.js
@@ -9,10 +9,9 @@
 
 let newCharacter = {
 	window: null,
+	messageLabel: null,
 	firstNameInput: null,
 	lastNameInput: null,
-	skinDropDown: null,
-	spawnAreaDropDown: null,
 	createButton: null,
 	mainLogoImage: null,
 };
@@ -21,13 +20,14 @@ let newCharacter = {
 
 function initNewCharacterGUI() {
 	logToConsole(LOG_DEBUG, `[VRR.GUI] Creating new character GUI ...`);
-	newCharacter.window = mexui.window(game.width/2-130, game.height/2-115, 300, 230, 'New Character', {
+	newCharacter.window = mexui.window(game.width/2-130, game.height/2-115, 300, 230, 'NEW CHARACTER', {
 		main: {
 			backgroundColour: toColour(secondaryColour[0], secondaryColour[1], secondaryColour[2], windowAlpha),
 			transitionTime: 500,
 		},
 		title: {
-			textSize: 0.0,
+			textSize: 12.0,
+			textFont: mainFont,
 			textColour: toColour(0, 0, 0, 0),
 			backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], windowTitleAlpha),
 		},
@@ -37,8 +37,10 @@ function initNewCharacterGUI() {
 			backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], windowTitleAlpha),
 		}
 	});
-	newCharacter.window.titleBarIconSize = toVector2(0,0);
-	newCharacter.window.titleBarHeight = 0;
+	newCharacter.window.titleBarIconSize = toVector2(0, 0);
+	newCharacter.window.titleBarIconShown = false;
+	newCharacter.window.titleBarShown = false;
+	newCharacter.window.titleBarHeight = 30;
 
 	newCharacter.mainLogoImage = newCharacter.window.image(80, 20, 80, 80, mainLogoPath, {
 		focused: {
@@ -133,8 +135,6 @@ function newCharacterFailed(errorMessage) {
 
 function checkNewCharacter() {
 	logToConsole(LOG_DEBUG, `[VRR.GUI] Checking new character with server ...`);
-	let skinId = false;
-
 	if(newCharacter.firstNameInput.lines[0].length < 2) {
 		return false;
 	}
diff --git a/scripts/client/gui/register.js b/scripts/client/gui/register.js
index eed08b7b..c80978aa 100644
--- a/scripts/client/gui/register.js
+++ b/scripts/client/gui/register.js
@@ -39,6 +39,7 @@ function initRegisterGUI() {
 	});
 	register.window.titleBarIconSize = toVector2(0,0);
 	register.window.titleBarHeight = 0;
+	register.window.titleBarShown = false;
 
 	register.window.image(100, 20, 100, 100, mainLogoPath, {
 		focused: {