From 85f53e6597c30b1f87eb0208022a69240f8af3c6 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 30 Dec 2015 00:26:21 +1100
Subject: [PATCH] Minor touchups to launcher.

---
 Launcher2/Gui/Screens/MainScreen.Classicube.cs |  2 +-
 Launcher2/Gui/Screens/MainScreen.cs            |  4 ++--
 Launcher2/Launcher2.csproj                     |  2 +-
 Launcher2/Utils/LauncherSkin.cs                | 16 ++++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Launcher2/Gui/Screens/MainScreen.Classicube.cs b/Launcher2/Gui/Screens/MainScreen.Classicube.cs
index 574c7a0df..77a395f8a 100644
--- a/Launcher2/Gui/Screens/MainScreen.Classicube.cs
+++ b/Launcher2/Gui/Screens/MainScreen.Classicube.cs
@@ -45,7 +45,7 @@ namespace Launcher2 {
 			MakeInput( Get(), 280, Anchor.Centre, true, 0, -100, 32, "&7Password.." );
 			
 			MakeButtonAt( "Sign in", 100, buttonHeight, buttonFont,
-			             Anchor.Centre, Anchor.Centre, 90, -50, LoginAsync );
+			             Anchor.Centre, Anchor.Centre, -90, -50, LoginAsync );
 			MakeLabelAt( Get(), inputFont, Anchor.Centre, Anchor.Centre, 0, 0 );
 		}
 
diff --git a/Launcher2/Gui/Screens/MainScreen.cs b/Launcher2/Gui/Screens/MainScreen.cs
index f2ca8333a..be8541bae 100644
--- a/Launcher2/Gui/Screens/MainScreen.cs
+++ b/Launcher2/Gui/Screens/MainScreen.cs
@@ -9,7 +9,7 @@ namespace Launcher2 {
 		
 		public MainScreen( LauncherWindow game ) : base( game, true ) {
 			buttonFont = new Font( "Arial", 16, FontStyle.Bold );
-			enterIndex = 4;
+			enterIndex = 2;
 			widgets = new LauncherWidget[11];
 			LoadResumeInfo();
 		}
@@ -27,7 +27,7 @@ namespace Launcher2 {
 			DrawClassicube();
 			
 			MakeButtonAt( "Resume", 100, buttonHeight, buttonFont,
-			             Anchor.Centre, Anchor.Centre, -90, -50, ResumeClick );
+			             Anchor.Centre, Anchor.Centre, 90, -50, ResumeClick );
 			
 			MakeButtonAt( "Direct connect", 200, buttonHeight, buttonFont,
 			             Anchor.Centre, Anchor.Centre, 0, 80,
diff --git a/Launcher2/Launcher2.csproj b/Launcher2/Launcher2.csproj
index bd6ecfa14..020d45cca 100644
--- a/Launcher2/Launcher2.csproj
+++ b/Launcher2/Launcher2.csproj
@@ -4,7 +4,7 @@
     <ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>Launcher2</RootNamespace>
     <AssemblyName>Launcher2</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
diff --git a/Launcher2/Utils/LauncherSkin.cs b/Launcher2/Utils/LauncherSkin.cs
index e1862fe96..7922e2dc5 100644
--- a/Launcher2/Utils/LauncherSkin.cs
+++ b/Launcher2/Utils/LauncherSkin.cs
@@ -9,31 +9,31 @@ namespace Launcher2 {
 		public static FastColour BackgroundCol = new FastColour( 153, 127, 172 );
 		public static FastColour ButtonBorderCol = new FastColour( 97, 81, 110 );
 		public static FastColour ButtonForeActiveCol = new FastColour( 189, 168, 206 );
-		public static FastColour ButtonForeCol = new FastColour( 101, 110, 137 );
-		public static FastColour ButtonHighlightCol = new FastColour( 122, 122, 145 );
+		public static FastColour ButtonForeCol = new FastColour( 141, 114, 165 );
+		public static FastColour ButtonHighlightCol = new FastColour( 162, 131, 186 );
 		
 		public static void ResetToDefault() {
 			BackgroundCol = new FastColour( 153, 127, 172 );
 			ButtonBorderCol = new FastColour( 97, 81, 110 );
 			ButtonForeActiveCol = new FastColour( 189, 168, 206 );
-			ButtonForeCol = new FastColour( 101, 110, 137 );
-			ButtonHighlightCol = new FastColour( 122, 122, 145 );
+			ButtonForeCol = new FastColour( 141, 114, 165 );
+			ButtonHighlightCol = new FastColour( 162, 131, 186 );
 		}
 		
 		public static void LoadFromOptions() {
 			Get( "launcher-back-col", ref BackgroundCol );
 			Get( "launcher-btn-border-col", ref ButtonBorderCol );
 			Get( "launcher-btn-fore-active-col", ref ButtonForeActiveCol );
-			Get( "launcher-btn-fore-col", ref ButtonForeCol );
-			Get( "launcher-btn-highlight-col", ref ButtonHighlightCol );
+			Get( "launcher-btn-fore-inactive-col", ref ButtonForeCol );
+			Get( "launcher-btn-highlight-inactive-col", ref ButtonHighlightCol );
 		}
 		
 		public static void SaveToOptions() {
 			Options.Set( "launcher-back-col", BackgroundCol.ToRGBHexString() );
 			Options.Set( "launcher-btn-border-col", ButtonBorderCol.ToRGBHexString() );
 			Options.Set( "launcher-btn-fore-active-col", ButtonForeActiveCol.ToRGBHexString() );
-			Options.Set( "launcher-btn-fore-col", ButtonForeCol.ToRGBHexString() );
-			Options.Set( "launcher-btn-highlight-col", ButtonHighlightCol.ToRGBHexString() );
+			Options.Set( "launcher-btn-fore-inactive-col", ButtonForeCol.ToRGBHexString() );
+			Options.Set( "launcher-btn-highlight-inactive-col", ButtonHighlightCol.ToRGBHexString() );
 		}
 		
 		static void Get( string key, ref FastColour col ) {