diff --git a/OpenRa.Game/Region.cs b/OpenRa.Game/Region.cs index 683fb0f18a..a3721aead0 100644 --- a/OpenRa.Game/Region.cs +++ b/OpenRa.Game/Region.cs @@ -32,7 +32,7 @@ namespace OpenRa.Game public static Region Create(Viewport v, DockStyle d, int size, MethodInvoker f) { Point topLeft = new Point(0, 0); - Point bottomRight = new Point(v.ClientSize); + Point bottomRight = new Point(v.Width, v.Height); Size s = MakeSize(v, d, size); diff --git a/OpenRa.Game/TerrainRenderer.cs b/OpenRa.Game/TerrainRenderer.cs index 7a77d8cafd..6852667354 100644 --- a/OpenRa.Game/TerrainRenderer.cs +++ b/OpenRa.Game/TerrainRenderer.cs @@ -24,7 +24,7 @@ namespace OpenRa.Game { this.renderer = renderer; this.viewport = viewport; - viewport.AddRegion(Region.Create(viewport, DockStyle.Left, viewport.ClientSize.Width - 128, Draw)); + viewport.AddRegion(Region.Create(viewport, DockStyle.Left, viewport.Width - 128, Draw)); this.map = map; tileSet = new TileSet(tilePackage, map.TileSuffix); diff --git a/OpenRa.Game/Viewport.cs b/OpenRa.Game/Viewport.cs index 768df0c77b..5f15601c00 100644 --- a/OpenRa.Game/Viewport.cs +++ b/OpenRa.Game/Viewport.cs @@ -14,10 +14,8 @@ namespace OpenRa.Game float2 scrollPosition; readonly Renderer renderer; - public Size ClientSize { get { return clientSize; } } - public float2 Location { get { return scrollPosition; } } - public float2 Size { get { return new float2(ClientSize); } } + public float2 Size { get { return new float2(clientSize); } } public int Width { get { return clientSize.Width; } } public int Height { get { return clientSize.Height; } } diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs index 31ceff7a46..91164c4dbf 100644 --- a/OpenRa.Game/World.cs +++ b/OpenRa.Game/World.cs @@ -19,7 +19,7 @@ namespace OpenRa.Game { this.renderer = renderer; this.viewport = viewport; - viewport.AddRegion(Region.Create(viewport, DockStyle.Left, viewport.ClientSize.Width - 128, Draw)); + viewport.AddRegion(Region.Create(viewport, DockStyle.Left, viewport.Width - 128, Draw)); spriteRenderer = new SpriteRenderer(renderer, true); }