epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Direct Connect window

Browse Source
This commit is contained in:
Bob
2010-09-25 19:25:34 +12:00
parent 959d3f8bd7
commit 636b2a8ea7
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Game/TraitCreator.cs Executable file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA
{
class TraitCreator
{
public static object Create( string traitName, World world, Actor actor, ITraitInfo info, TypeDictionary init )
{
var argsDict = new Dictionary<string, object>
{
{ "world", world },
{ "self", actor },
{ "initDict", init },
{ "init", new ActorInitializer( actor, init ) },
{ "info", info },
};
return Game.modData.ObjectCreator.CreateObject<object>( traitName, argsDict );
}
}
}

12
OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
View File

@@ -30,8 +30,8 @@ namespace OpenRA.Widgets.Delegates
MasterServerQuery.OnComplete += games => RefreshServerList(games); MasterServerQuery.OnComplete += games => RefreshServerList(games);
widget.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true; bg.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
widget.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list..."; bg.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
bg.Children.RemoveAll(a => GameButtons.Contains(a)); bg.Children.RemoveAll(a => GameButtons.Contains(a));
GameButtons.Clear(); GameButtons.Clear();
@@ -62,8 +62,8 @@ namespace OpenRA.Widgets.Delegates
bg.GetWidget("REFRESH_BUTTON").OnMouseUp = mi => bg.GetWidget("REFRESH_BUTTON").OnMouseUp = mi =>
{ {
widget.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true; bg.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
widget.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list..."; bg.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
bg.Children.RemoveAll(a => GameButtons.Contains(a)); bg.Children.RemoveAll(a => GameButtons.Contains(a));
GameButtons.Clear(); GameButtons.Clear();
@@ -184,7 +184,6 @@ namespace OpenRA.Widgets.Delegates
dc.GetWidget("JOIN_BUTTON").OnMouseUp = mi => dc.GetWidget("JOIN_BUTTON").OnMouseUp = mi =>
{ {
var address = dc.GetWidget<TextFieldWidget>("SERVER_ADDRESS").Text; var address = dc.GetWidget<TextFieldWidget>("SERVER_ADDRESS").Text;
var cpts = address.Split(':').ToArray(); var cpts = address.Split(':').ToArray();
if (cpts.Length != 2) if (cpts.Length != 2)
@@ -201,7 +200,8 @@ namespace OpenRA.Widgets.Delegates
dc.GetWidget("CANCEL_BUTTON").OnMouseUp = mi => dc.GetWidget("CANCEL_BUTTON").OnMouseUp = mi =>
{ {
Widget.CloseWindow(); Widget.CloseWindow();
return widget.GetWidget("MAINMENU_BUTTON_JOIN").OnMouseUp(mi); Widget.OpenWindow("MAINMENU_BG");
return true;
}; };
} }
} }

2
mods/ra/chrome/serverbrowser.yaml
View File

@@ -247,7 +247,7 @@ Background@JOINSERVER_BG:
Bold:True Bold:True
Background@DIRECTCONNECT_BG: Background@DIRECTCONNECT_BG:
Id:DIRECTCONNECT_BG Id:DIRECTCONNECT_BG
Delegate:ServerBrowserDelegate Delegate:DirectConnectDelegate
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:400 Width:400