AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enter will now also click the active widget in the launcher screens.

Browse Source
This commit is contained in:
UnknownShadow200 2015-12-10 09:34:57 +11:00
parent 4d1026e5a4
commit 058b71e61b
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Launcher2/Gui/Screens/ClassiCubeServersScreen.cs
View File

@ -43,9 +43,12 @@ namespace Launcher2 {
protected override void KeyDown( object sender, KeyboardKeyEventArgs e ) { protected override void KeyDown( object sender, KeyboardKeyEventArgs e ) {
LauncherTableWidget table = (LauncherTableWidget)widgets[tableIndex]; LauncherTableWidget table = (LauncherTableWidget)widgets[tableIndex];
if( e.Key == Key.Enter ) { if( e.Key == Key.Enter ) {
if( table.Count == 1 && String.IsNullOrEmpty( Get( 3 ) ) ) if( table.Count == 1 && String.IsNullOrEmpty( Get( 3 ) ) ) {
widgets[3].Text = table.usedEntries[0].Hash; widgets[3].Text = table.usedEntries[0].Hash;
ConnectToServer( 0, 0 ); ConnectToServer( 0, 0 );
} else {
base.KeyDown( sender, e );
}
} else if( e.Key == Key.Up ) { } else if( e.Key == Key.Up ) {
table.SetSelected( table.SelectedIndex - 1 ); table.SetSelected( table.SelectedIndex - 1 );
table.NeedRedraw(); table.NeedRedraw();

5
Launcher2/Gui/Screens/LauncherInputScreen.cs
View File

@ -1,8 +1,8 @@
using System; using System;
using System.Drawing; using System.Drawing;
using ClassicalSharp;
using OpenTK; using OpenTK;
using OpenTK.Input; using OpenTK.Input;
using ClassicalSharp;
namespace Launcher2 { namespace Launcher2 {
@ -31,7 +31,8 @@ namespace Launcher2 {
OnRemovedChar(); OnRemovedChar();
} }
} else if( e.Key == Key.Enter && enterIndex >= 0 ) { } else if( e.Key == Key.Enter && enterIndex >= 0 ) {
LauncherWidget widget = widgets[enterIndex]; LauncherWidget widget = selectedWidget != null ?
selectedWidget : widgets[enterIndex];
if( widget.OnClick != null ) if( widget.OnClick != null )
widget.OnClick( 0, 0 ); widget.OnClick( 0, 0 );
} else if( e.Key == Key.Tab ) { } else if( e.Key == Key.Tab ) {

10
Launcher2/Gui/Screens/MainScreen.cs
View File

@ -27,10 +27,14 @@ namespace Launcher2 {
} }
void KeyDown( object sender, KeyboardKeyEventArgs e ) { void KeyDown( object sender, KeyboardKeyEventArgs e ) {
if( e.Key == Key.Tab ) if( e.Key == Key.Tab ) {
HandleTab(); HandleTab();
else if( e.Key == Key.Enter ) } else if( e.Key == Key.Enter ) {
widgets[0].OnClick( 0, 0 ); LauncherWidget widget = selectedWidget != null ?
selectedWidget : widgets[0];
if( widget.OnClick != null )
widget.OnClick( 0, 0 );
}
} }
void KeyUp( object sender, KeyboardKeyEventArgs e ) { void KeyUp( object sender, KeyboardKeyEventArgs e ) {

20
Launcher2/Gui/Screens/UpdatesScreen.cs
View File

@ -1,9 +1,9 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.IO; using System.IO;
using ClassicalSharp; using ClassicalSharp;
using Launcher2.Updater; using Launcher2.Updater;
using OpenTK.Input;
namespace Launcher2 { namespace Launcher2 {
@ -25,9 +25,25 @@ namespace Launcher2 {
public override void Init() { public override void Init() {
checkTask = new UpdateCheckTask(); checkTask = new UpdateCheckTask();
checkTask.CheckForUpdatesAsync(); checkTask.CheckForUpdatesAsync();
game.Window.Keyboard.KeyDown += KeyDown;
game.Window.Keyboard.KeyUp += KeyUp;
Resize(); Resize();
} }
void KeyDown( object sender, KeyboardKeyEventArgs e ) {
if( e.Key == Key.Tab ) {
HandleTab();
} else if( e.Key == Key.Enter ) {
LauncherWidget widget = selectedWidget;
if( widget != null && widget.OnClick != null )
widget.OnClick( 0, 0 );
}
}
void KeyUp( object sender, KeyboardKeyEventArgs e ) {
if( e.Key == Key.Tab )
tabDown = false;
}
Build dev, stable; Build dev, stable;
public override void Tick() { public override void Tick() {
@ -107,6 +123,8 @@ namespace Launcher2 {
} }
public override void Dispose() { public override void Dispose() {
game.Window.Keyboard.KeyDown -= KeyDown;
game.Window.Keyboard.KeyUp -= KeyUp;
game.Window.Mouse.Move -= MouseMove; game.Window.Mouse.Move -= MouseMove;
game.Window.Mouse.ButtonDown -= MouseButtonDown; game.Window.Mouse.ButtonDown -= MouseButtonDown;