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

6
OpenRA.Game/Widgets/SliderWidget.cs
View File

@@ -88,7 +88,7 @@ namespace OpenRA.Widgets
case MouseInputEvent.Down:
{
if (thumbRect.Contains(mi.Location.ToPoint()))
if (thumbRect.Contains(mi.Location))
{
isMoving = true;
lastMouseLocation = mi.Location;
@@ -103,7 +103,7 @@ namespace OpenRA.Widgets
: Math.Floor((pos - delta) * (Ticks - 1)));
OnChange(targetTick / (Ticks - 1));
if (thumbRect.Contains(mi.Location.ToPoint()))
if (thumbRect.Contains(mi.Location))
{
isMoving = true;
lastMouseLocation = mi.Location;
@@ -119,7 +119,7 @@ namespace OpenRA.Widgets
{
OnChange(newOffset);
if (thumbRect.Contains(mi.Location.ToPoint()))
if (thumbRect.Contains(mi.Location))
{
isMoving = true;
lastMouseLocation = mi.Location;

4
OpenRA.Game/Widgets/Widget.cs
View File

@@ -180,7 +180,7 @@ namespace OpenRA.Widgets
public string GetCursorOuter(int2 pos)
{
// Is the cursor on top of us?
if (!(IsVisible() && GetEventBounds().Contains(pos.ToPoint())))
if (!(IsVisible() && GetEventBounds().Contains(pos)))
return null;
// Do any of our children specify a cursor?
@@ -191,7 +191,7 @@ namespace OpenRA.Widgets
return cc;
}
return EventBounds.Contains(pos.ToPoint()) ? GetCursor(pos) : null;
return EventBounds.Contains(pos) ? GetCursor(pos) : null;
}
public static bool HandleInput(MouseInput mi)