Minor touchups to launcher.

This commit is contained in:
UnknownShadow200 2015-12-30 00:26:21 +11:00
parent 744e2882d7
commit 85f53e6597
4 changed files with 12 additions and 12 deletions

View File

@ -45,7 +45,7 @@ namespace Launcher2 {
MakeInput( Get(), 280, Anchor.Centre, true, 0, -100, 32, "&7Password.." ); MakeInput( Get(), 280, Anchor.Centre, true, 0, -100, 32, "&7Password.." );
MakeButtonAt( "Sign in", 100, buttonHeight, buttonFont, 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 ); MakeLabelAt( Get(), inputFont, Anchor.Centre, Anchor.Centre, 0, 0 );
} }

View File

@ -9,7 +9,7 @@ namespace Launcher2 {
public MainScreen( LauncherWindow game ) : base( game, true ) { public MainScreen( LauncherWindow game ) : base( game, true ) {
buttonFont = new Font( "Arial", 16, FontStyle.Bold ); buttonFont = new Font( "Arial", 16, FontStyle.Bold );
enterIndex = 4; enterIndex = 2;
widgets = new LauncherWidget[11]; widgets = new LauncherWidget[11];
LoadResumeInfo(); LoadResumeInfo();
} }
@ -27,7 +27,7 @@ namespace Launcher2 {
DrawClassicube(); DrawClassicube();
MakeButtonAt( "Resume", 100, buttonHeight, buttonFont, 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, MakeButtonAt( "Direct connect", 200, buttonHeight, buttonFont,
Anchor.Centre, Anchor.Centre, 0, 80, Anchor.Centre, Anchor.Centre, 0, 80,

View File

@ -4,7 +4,7 @@
<ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid> <ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Exe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>Launcher2</RootNamespace> <RootNamespace>Launcher2</RootNamespace>
<AssemblyName>Launcher2</AssemblyName> <AssemblyName>Launcher2</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

View File

@ -9,31 +9,31 @@ namespace Launcher2 {
public static FastColour BackgroundCol = new FastColour( 153, 127, 172 ); public static FastColour BackgroundCol = new FastColour( 153, 127, 172 );
public static FastColour ButtonBorderCol = new FastColour( 97, 81, 110 ); public static FastColour ButtonBorderCol = new FastColour( 97, 81, 110 );
public static FastColour ButtonForeActiveCol = new FastColour( 189, 168, 206 ); public static FastColour ButtonForeActiveCol = new FastColour( 189, 168, 206 );
public static FastColour ButtonForeCol = new FastColour( 101, 110, 137 ); public static FastColour ButtonForeCol = new FastColour( 141, 114, 165 );
public static FastColour ButtonHighlightCol = new FastColour( 122, 122, 145 ); public static FastColour ButtonHighlightCol = new FastColour( 162, 131, 186 );
public static void ResetToDefault() { public static void ResetToDefault() {
BackgroundCol = new FastColour( 153, 127, 172 ); BackgroundCol = new FastColour( 153, 127, 172 );
ButtonBorderCol = new FastColour( 97, 81, 110 ); ButtonBorderCol = new FastColour( 97, 81, 110 );
ButtonForeActiveCol = new FastColour( 189, 168, 206 ); ButtonForeActiveCol = new FastColour( 189, 168, 206 );
ButtonForeCol = new FastColour( 101, 110, 137 ); ButtonForeCol = new FastColour( 141, 114, 165 );
ButtonHighlightCol = new FastColour( 122, 122, 145 ); ButtonHighlightCol = new FastColour( 162, 131, 186 );
} }
public static void LoadFromOptions() { public static void LoadFromOptions() {
Get( "launcher-back-col", ref BackgroundCol ); Get( "launcher-back-col", ref BackgroundCol );
Get( "launcher-btn-border-col", ref ButtonBorderCol ); Get( "launcher-btn-border-col", ref ButtonBorderCol );
Get( "launcher-btn-fore-active-col", ref ButtonForeActiveCol ); Get( "launcher-btn-fore-active-col", ref ButtonForeActiveCol );
Get( "launcher-btn-fore-col", ref ButtonForeCol ); Get( "launcher-btn-fore-inactive-col", ref ButtonForeCol );
Get( "launcher-btn-highlight-col", ref ButtonHighlightCol ); Get( "launcher-btn-highlight-inactive-col", ref ButtonHighlightCol );
} }
public static void SaveToOptions() { public static void SaveToOptions() {
Options.Set( "launcher-back-col", BackgroundCol.ToRGBHexString() ); Options.Set( "launcher-back-col", BackgroundCol.ToRGBHexString() );
Options.Set( "launcher-btn-border-col", ButtonBorderCol.ToRGBHexString() ); Options.Set( "launcher-btn-border-col", ButtonBorderCol.ToRGBHexString() );
Options.Set( "launcher-btn-fore-active-col", ButtonForeActiveCol.ToRGBHexString() ); Options.Set( "launcher-btn-fore-active-col", ButtonForeActiveCol.ToRGBHexString() );
Options.Set( "launcher-btn-fore-col", ButtonForeCol.ToRGBHexString() ); Options.Set( "launcher-btn-fore-inactive-col", ButtonForeCol.ToRGBHexString() );
Options.Set( "launcher-btn-highlight-col", ButtonHighlightCol.ToRGBHexString() ); Options.Set( "launcher-btn-highlight-inactive-col", ButtonHighlightCol.ToRGBHexString() );
} }
static void Get( string key, ref FastColour col ) { static void Get( string key, ref FastColour col ) {