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

Merge pull request #10491 from pchote/fix-country-overflow

Browse Source 
Fix MP browser country name overflow
This commit is contained in:
RoosterDragon
2016-01-15 19:54:09 +00:00
parent db520a8560 675faa2a6d
commit 999965fc82
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Widgets/Logic/MultiplayerLogic.cs
View File

@@ -402,8 +402,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var location = item.GetOrNull<LabelWidget>("LOCATION");
if (location != null)
{
var font = Game.Renderer.Fonts[location.Font];
var cachedServerLocation = GeoIP.LookupCountry(game.Address.Split(':')[0]);
location.GetText = () => cachedServerLocation;
var label = WidgetUtils.TruncateText(cachedServerLocation, location.Bounds.Width, font);
location.GetText = () => label;
location.GetColor = () => canJoin ? location.TextColor : incompatibleGameColor;
}

4
mods/cnc/chrome/multiplayer-browser.yaml
View File

@@ -22,7 +22,7 @@ Container@MULTIPLAYER_BROWSER_PANEL:
Font: Bold
Label@LOCATION:
X: 380
Width: 120
Width: 110
Height: 25
Text: Country
Font: Bold
@@ -71,7 +71,7 @@ Container@MULTIPLAYER_BROWSER_PANEL:
Height: 25
Label@LOCATION:
X: 380
Width: 120
Width: 110
Height: 25
Label@STATUS:
X: 495

4
mods/ra/chrome/multiplayer-browser.yaml
View File

@@ -22,7 +22,7 @@ Container@MULTIPLAYER_BROWSER_PANEL:
Font: Bold
Label@LOCATION:
X: 380
Width: 120
Width: 110
Height: 25
Text: Country
Font: Bold
@@ -72,7 +72,7 @@ Container@MULTIPLAYER_BROWSER_PANEL:
Height: 25
Label@LOCATION:
X: 380
Width: 120
Width: 110
Height: 25
Label@STATUS:
X: 495