Skip to content

Commit

Permalink
fix prev so it compiles with csc
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisforbes committed Jul 14, 2010
1 parent c3532fc commit 17bf461
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
Expand Up @@ -4,6 +4,7 @@
using System.Text;
using OpenRA.FileFormats.Graphics;
using System.Windows.Forms;
using OpenRA.GameRules;

namespace OpenRA.Widgets.Delegates
{
Expand Down Expand Up @@ -69,38 +70,38 @@ public SettingsMenuDelegate()
};

var width = display.GetWidget<TextFieldWidget>("SCREEN_WIDTH");
Game.Settings.WindowedSize.X = (Game.Settings.WindowedSize.X < Game.Settings.MinResolution.X)?
Game.Settings.MinResolution.X : Game.Settings.WindowedSize.X;
Game.Settings.WindowedSize.X = (Game.Settings.WindowedSize.X < UserSettings.MinResolution.X)?
UserSettings.MinResolution.X : Game.Settings.WindowedSize.X;
width.Text = Game.Settings.WindowedSize.X.ToString();
width.OnLoseFocus = () =>
{
try {
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);
else
width.Text = Game.Settings.WindowedSize.X.ToString();
}
catch (FormatException e) {
catch (FormatException) {
width.Text = Game.Settings.WindowedSize.X.ToString();
}
};
width.OnEnterKey = () => { width.LoseFocus(); return true; };

var height = display.GetWidget<TextFieldWidget>("SCREEN_HEIGHT");
Game.Settings.WindowedSize.Y = (Game.Settings.WindowedSize.Y < Game.Settings.MinResolution.Y)?
Game.Settings.MinResolution.Y : Game.Settings.WindowedSize.Y;
Game.Settings.WindowedSize.Y = (Game.Settings.WindowedSize.Y < UserSettings.MinResolution.Y)?
UserSettings.MinResolution.Y : Game.Settings.WindowedSize.Y;
height.Text = Game.Settings.WindowedSize.Y.ToString();
height.OnLoseFocus = () =>
{
try {
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);
else
height.Text = Game.Settings.WindowedSize.Y.ToString();
}
catch (System.FormatException) {
catch (FormatException) {
height.Text = Game.Settings.WindowedSize.Y.ToString();
}
};
Expand Down

0 comments on commit 17bf461

Please sign in to comment.