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

Add extension methods to Rectangle/RectangleF, remove a pile of ToPoint()'s.

Browse Source
This commit is contained in:
Paul Chote
2011-01-05 22:24:11 +13:00
parent 3e1db3e8ae
commit df460d7407
7 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA.Widgets
{
if (mi.Event == MouseInputEvent.Down)
{
var action = buttons.Where(a => a.First.Contains(mi.Location.ToPoint()))
var action = buttons.Where(a => a.First.Contains(mi.Location))
.Select(a => a.Second).FirstOrDefault();
if (action == null)
return false;
@@ -99,7 +99,7 @@ namespace OpenRA.Mods.RA.Widgets
var drawPos = new float2(rectBounds.X + 5, y);
var rect = new Rectangle(rectBounds.X + 5, y, 64, 48);
if (rect.Contains(Viewport.LastMousePos.ToPoint()))
if (rect.Contains(Viewport.LastMousePos))
{
var pos = drawPos.ToInt2();
var tl = new int2(pos.X-3,pos.Y-3);