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

Fix minor issue with ErrorScreen unnecessarily redrawing the button.

Browse Source
This commit is contained in:
UnknownShadow200 2016-08-16 12:14:43 +10:00
parent 6b2651b8fb
commit e39be25b3f
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ClassicalSharp/2D/Screens/ErrorScreen.cs
View File

@ -23,7 +23,7 @@ namespace ClassicalSharp.Gui {
UpdateReconnectState( delta ); UpdateReconnectState( delta );
// NOTE: We need to make sure that both the front and back buffers have // NOTE: We need to make sure that both the front and back buffers have
// definitely been drawn over, so we redraw the background multiple times. // definitely been drawn over, so we redraw the background multiple times.
if( DateTime.UtcNow < clearTime ) if( DateTime.UtcNow < clearTime )
Redraw( delta ); Redraw( delta );
} }
@ -32,11 +32,11 @@ namespace ClassicalSharp.Gui {
widgets = new Widget[] { widgets = new Widget[] {
ChatTextWidget.Create( game, 0, -30, title, Anchor.Centre, Anchor.Centre, titleFont ), ChatTextWidget.Create( game, 0, -30, title, Anchor.Centre, Anchor.Centre, titleFont ),
ChatTextWidget.Create( game, 0, 10, message, Anchor.Centre, Anchor.Centre, messageFont ), ChatTextWidget.Create( game, 0, 10, message, Anchor.Centre, Anchor.Centre, messageFont ),
ButtonWidget.Create( game, 0, 80, 301, 40, "Try to reconnect.. " + delay, ButtonWidget.Create( game, 0, 80, 301, 40, "Try to reconnect.. " + delay,
Anchor.Centre, Anchor.Centre, titleFont, ReconnectClick ), Anchor.Centre, Anchor.Centre, titleFont, ReconnectClick ),
}; };
game.Graphics.ContextRecreated += ContextRecreated; game.Graphics.ContextRecreated += ContextRecreated;
initTime = DateTime.UtcNow; initTime = DateTime.UtcNow;
clearTime = DateTime.UtcNow.AddSeconds( 0.5 ); clearTime = DateTime.UtcNow.AddSeconds( 0.5 );
lastSecsLeft = delay; lastSecsLeft = delay;
@ -44,7 +44,7 @@ namespace ClassicalSharp.Gui {
public override void Dispose() { public override void Dispose() {
game.SkipClear = false; game.SkipClear = false;
game.Graphics.ContextRecreated -= ContextRecreated; game.Graphics.ContextRecreated -= ContextRecreated;
titleFont.Dispose(); titleFont.Dispose();
messageFont.Dispose(); messageFont.Dispose();
for( int i = 0; i < widgets.Length; i++ ) for( int i = 0; i < widgets.Length; i++ )
@ -79,21 +79,25 @@ namespace ClassicalSharp.Gui {
public override bool HandlesMouseScroll( int delta ) { return true; } public override bool HandlesMouseScroll( int delta ) { return true; }
public override bool HandlesMouseUp( int mouseX, int mouseY, MouseButton button ) { return true; } public override bool HandlesMouseUp( int mouseX, int mouseY, MouseButton button ) { return true; }
int lastSecsLeft; int lastSecsLeft;
const int delay = 5; const int delay = 5;
bool lastActive = false;
void UpdateReconnectState( double delta ) { void UpdateReconnectState( double delta ) {
ButtonWidget btn = (ButtonWidget)widgets[2]; ButtonWidget btn = (ButtonWidget)widgets[2];
double elapsed = (DateTime.UtcNow - initTime).TotalSeconds; double elapsed = (DateTime.UtcNow - initTime).TotalSeconds;
int scsLeft = Math.Max( 0, (int)(delay - elapsed) ); int secsLeft = Math.Max( 0, (int)(delay - elapsed) );
if( lastSecsLeft == scsLeft ) return; if( lastSecsLeft == secsLeft && btn.Active == lastActive ) return;
if( secsLeft == 0 ) btn.SetText( "Try to reconnect" );
else btn.SetText( "Try to reconnect.. " + secsLeft );
btn.Disabled = secsLeft != 0;
string suffix = scsLeft == 0 ? "" : ".. " + scsLeft;
btn.SetText( "Try to reconnect" + suffix );
btn.Disabled = scsLeft != 0;
Redraw( delta ); Redraw( delta );
lastSecsLeft = secsLeft;
lastActive = btn.Active;
} }
readonly FastColour top = new FastColour( 64, 32, 32 ), bottom = new FastColour( 80, 16, 16 ); readonly FastColour top = new FastColour( 64, 32, 32 ), bottom = new FastColour( 80, 16, 16 );
@ -102,7 +106,7 @@ namespace ClassicalSharp.Gui {
api.Texturing = true; api.Texturing = true;
for( int i = 0; i < widgets.Length; i++ ) for( int i = 0; i < widgets.Length; i++ )
widgets[i].Render( delta ); widgets[i].Render( delta );
api.Texturing = false; api.Texturing = false;
} }
void ReconnectClick( Game g, Widget w, MouseButton mouseBtn ) { void ReconnectClick( Game g, Widget w, MouseButton mouseBtn ) {