AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 02:25:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix up key in chat, fix table being resized to 20 pixels when minimising then reopening.

Browse Source
This commit is contained in:
UnknownShadow200 2015-11-07 12:25:09 +11:00
parent bab357300e
commit b9ab4df820
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClassicalSharp/Game/ChatLog.cs
View File

@ -25,6 +25,7 @@ namespace ClassicalSharp {
public int FontSize = 12; public int FontSize = 12;
public void Send( string text, bool partial ) { public void Send( string text, bool partial ) {
text = text.TrimEnd( trimChars );
if( String.IsNullOrEmpty( text ) ) return; if( String.IsNullOrEmpty( text ) ) return;
InputLog.Add( text ); InputLog.Add( text );
@ -35,6 +36,7 @@ namespace ClassicalSharp {
game.Network.SendChat( text, partial ); game.Network.SendChat( text, partial );
} }
static char[] trimChars = new [] { ' ', '\0' };
public void Add( string text ) { public void Add( string text ) {
Log.Add( text ); Log.Add( text );
LogChatToFile( text ); LogChatToFile( text );

1
ClassicalSharp/Network/Utils/AsyncDownloader.cs
View File

@ -215,6 +215,7 @@ namespace ClassicalSharp.Network {
req.ReadWriteTimeout = 15 * 1000; req.ReadWriteTimeout = 15 * 1000;
req.Timeout = 15 * 1000; req.Timeout = 15 * 1000;
req.Proxy = null; req.Proxy = null;
req.UserAgent = Program.AppName;
if( request.LastModified != DateTime.MinValue ) if( request.LastModified != DateTime.MinValue )
req.IfModifiedSince = request.LastModified; req.IfModifiedSince = request.LastModified;

1
Launcher2/Gui/TableWidget/LauncherTableWidget.Input.cs
View File

@ -57,6 +57,7 @@ namespace Launcher2 {
if( DraggingWidth ) { if( DraggingWidth ) {
ColumnWidths[0] += deltaX; ColumnWidths[0] += deltaX;
Utils.Clamp( ref ColumnWidths[0], 20, Window.Width - 20 ); Utils.Clamp( ref ColumnWidths[0], 20, Window.Width - 20 );
DesiredColumnWidths[0] = ColumnWidths[0];
NeedRedraw(); NeedRedraw();
} }
} }

3
Launcher2/Gui/TableWidget/LauncherTableWidget.cs
View File

@ -53,6 +53,7 @@ namespace Launcher2 {
public int CurrentIndex, Count; public int CurrentIndex, Count;
public int[] ColumnWidths = { 350, 100 }; public int[] ColumnWidths = { 350, 100 };
public int[] DesiredColumnWidths = { 350, 100 };
struct TableEntry { struct TableEntry {
public string Hash, Name, Players; public string Hash, Name, Players;
@ -68,8 +69,10 @@ namespace Launcher2 {
static FastColour backCol = new FastColour( 120, 85, 151 ), foreCol = new FastColour( 160, 133, 186 ); static FastColour backCol = new FastColour( 120, 85, 151 ), foreCol = new FastColour( 160, 133, 186 );
static FastColour scrollCol = new FastColour( 200, 184, 216 ); static FastColour scrollCol = new FastColour( 200, 184, 216 );
public void Redraw( IDrawer2D drawer, Font font, Font titleFont, Font boldFont ) { public void Redraw( IDrawer2D drawer, Font font, Font titleFont, Font boldFont ) {
ColumnWidths[0] = DesiredColumnWidths[0];
Utils.Clamp( ref ColumnWidths[0], 20, Window.Width - 20 ); Utils.Clamp( ref ColumnWidths[0], 20, Window.Width - 20 );
int x = X + 5; int x = X + 5;
DrawGrid( drawer, font, titleFont ); DrawGrid( drawer, font, titleFont );
x += DrawColumn( drawer, true, font, titleFont, boldFont, "Name", ColumnWidths[0], x, e => e.Name ) + 5; x += DrawColumn( drawer, true, font, titleFont, boldFont, "Name", ColumnWidths[0], x, e => e.Name ) + 5;
x += DrawColumn( drawer, false, font, titleFont, boldFont, "Players", ColumnWidths[1], x, e => e.Players ) + 5; x += DrawColumn( drawer, false, font, titleFont, boldFont, "Players", ColumnWidths[1], x, e => e.Players ) + 5;

2
Launcher2/Launcher2.csproj
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>WinExe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>Launcher2</RootNamespace> <RootNamespace>Launcher2</RootNamespace>
<AssemblyName>Launcher2</AssemblyName> <AssemblyName>Launcher2</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>