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

fix prev so it compiles with csc

Browse Source
This commit is contained in:
Chris Forbes
2010-07-14 17:34:55 +12:00
parent c3532fc9ea
commit 17bf4610f1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using System.Windows.Forms; using System.Windows.Forms;
using OpenRA.GameRules;
namespace OpenRA.Widgets.Delegates namespace OpenRA.Widgets.Delegates
{ {
@@ -69,38 +70,38 @@ namespace OpenRA.Widgets.Delegates
}; };
var width = display.GetWidget<TextFieldWidget>("SCREEN_WIDTH"); var width = display.GetWidget<TextFieldWidget>("SCREEN_WIDTH");
Game.Settings.WindowedSize.X = (Game.Settings.WindowedSize.X < Game.Settings.MinResolution.X)? Game.Settings.WindowedSize.X = (Game.Settings.WindowedSize.X < UserSettings.MinResolution.X)?
Game.Settings.MinResolution.X : Game.Settings.WindowedSize.X; UserSettings.MinResolution.X : Game.Settings.WindowedSize.X;
width.Text = Game.Settings.WindowedSize.X.ToString(); width.Text = Game.Settings.WindowedSize.X.ToString();
width.OnLoseFocus = () => width.OnLoseFocus = () =>
{ {
try { try {
var w = int.Parse(width.Text); var w = int.Parse(width.Text);
if (w > Game.Settings.MinResolution.X && w <= Screen.PrimaryScreen.Bounds.Size.Width) if (w > UserSettings.MinResolution.X && w <= Screen.PrimaryScreen.Bounds.Size.Width)
Game.Settings.WindowedSize = new int2(w, Game.Settings.WindowedSize.Y); Game.Settings.WindowedSize = new int2(w, Game.Settings.WindowedSize.Y);
else else
width.Text = Game.Settings.WindowedSize.X.ToString(); width.Text = Game.Settings.WindowedSize.X.ToString();
} }
catch (FormatException e) { catch (FormatException) {
width.Text = Game.Settings.WindowedSize.X.ToString(); width.Text = Game.Settings.WindowedSize.X.ToString();
} }
}; };
width.OnEnterKey = () => { width.LoseFocus(); return true; }; width.OnEnterKey = () => { width.LoseFocus(); return true; };
var height = display.GetWidget<TextFieldWidget>("SCREEN_HEIGHT"); var height = display.GetWidget<TextFieldWidget>("SCREEN_HEIGHT");
Game.Settings.WindowedSize.Y = (Game.Settings.WindowedSize.Y < Game.Settings.MinResolution.Y)? Game.Settings.WindowedSize.Y = (Game.Settings.WindowedSize.Y < UserSettings.MinResolution.Y)?
Game.Settings.MinResolution.Y : Game.Settings.WindowedSize.Y; UserSettings.MinResolution.Y : Game.Settings.WindowedSize.Y;
height.Text = Game.Settings.WindowedSize.Y.ToString(); height.Text = Game.Settings.WindowedSize.Y.ToString();
height.OnLoseFocus = () => height.OnLoseFocus = () =>
{ {
try { try {
var h = int.Parse(height.Text); var h = int.Parse(height.Text);
if (h > Game.Settings.MinResolution.Y && h <= Screen.PrimaryScreen.Bounds.Size.Height) if (h > UserSettings.MinResolution.Y && h <= Screen.PrimaryScreen.Bounds.Size.Height)
Game.Settings.WindowedSize = new int2(Game.Settings.WindowedSize.X, h); Game.Settings.WindowedSize = new int2(Game.Settings.WindowedSize.X, h);
else else
height.Text = Game.Settings.WindowedSize.Y.ToString(); height.Text = Game.Settings.WindowedSize.Y.ToString();
} }
catch (System.FormatException) { catch (FormatException) {
height.Text = Game.Settings.WindowedSize.Y.ToString(); height.Text = Game.Settings.WindowedSize.Y.ToString();
} }
}; };