git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1222 993157c7-ee19-0410-b2c4-bb4e9862e678

This commit is contained in:
chrisf
2007-07-14 06:33:17 +00:00
parent 6e0bf41569
commit 89d8056918

View File

@@ -73,15 +73,12 @@ namespace OpenRa.Game
} }
} }
Point lastPos;
int x1,y1;
protected override void OnMouseDown(MouseEventArgs e) protected override void OnMouseDown(MouseEventArgs e)
{ {
base.OnMouseDown(e); base.OnMouseDown(e);
lastPos = e.Location;
x1 = e.X;
y1 = e.Y;
} }
protected override void OnMouseMove(MouseEventArgs e) protected override void OnMouseMove(MouseEventArgs e)
@@ -91,14 +88,11 @@ namespace OpenRa.Game
if (e.Button != 0) if (e.Button != 0)
{ {
PointF scrollPos = viewport.ScrollPosition; PointF scrollPos = viewport.ScrollPosition;
scrollPos.X += x1 - e.X; scrollPos.X = Util.Constrain(scrollPos.X + lastPos.X - e.X, new Range<float>(0, map.Width * 24 - ClientSize.Width + 128));
scrollPos.Y += y1 - e.Y; scrollPos.Y = Util.Constrain(scrollPos.Y + lastPos.Y - e.Y, new Range<float>(0, map.Height * 24 - ClientSize.Height));
x1 = e.X; lastPos = e.Location;
y1 = e.Y;
scrollPos.X = Util.Constrain(scrollPos.X, new Range<float>(0, map.Width * 24 - ClientSize.Width + 128));
scrollPos.Y = Util.Constrain(scrollPos.Y, new Range<float>(0, map.Height * 24 - ClientSize.Height));
viewport.ScrollPosition = scrollPos; viewport.ScrollPosition = scrollPos;
} }
} }