Skip to content

Commit 1781dc5

Browse files
Fixed dragging in TopDown view setting Y-coordinate to 0
1 parent 7d35967 commit 1781dc5

6 files changed

Lines changed: 10 additions & 6 deletions

File tree

STROOP/Tabs/MapTab/IHoverData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface IHoverData
88
void AddContextMenuItems(MapTab tab, ContextMenuStrip menu);
99
void LeftClick(Vector3 position);
1010
void RightClick(Vector3 position);
11-
void DragTo(Vector3 position);
11+
void DragTo(Vector3 position, bool setY);
1212
bool CanDrag();
1313
}
1414
}

STROOP/Tabs/MapTab/MapGraphics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ private void OnMouseMove(object sender, MouseEventArgs e)
800800
foreach (var hover in mapTab.hoverData)
801801
if (mouseDown[0] && hover.CanDrag())
802802
{
803-
hover.DragTo(mapCursorPosition);
803+
hover.DragTo(mapCursorPosition, view.mode != MapView.ViewMode.TopDown);
804804
return;
805805
}
806806
}

STROOP/Tabs/MapTab/MapObjects/HoverDatas.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ public virtual void RightClick(Vector3 position) { }
2323

2424
public virtual bool CanDrag() => parent.enableDragging.Checked;
2525

26-
public void DragTo(Vector3 newPosition)
26+
public void DragTo(Vector3 newPosition, bool setY)
2727
{
2828
if (CanDrag())
29+
{
30+
if (!setY)
31+
newPosition.Y = GetPosition().Y;
2932
SetPosition(newPosition);
33+
}
3034
}
3135

3236
public virtual void Pivot(MapTab tab)

STROOP/Tabs/MapTab/MapObjects/MapDrawingObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void AddContextMenuItems(MapTab tab, ContextMenuStrip menu)
3131

3232
public bool CanDrag() => true;
3333

34-
public void DragTo(Vector3 newPosition)
34+
public void DragTo(Vector3 newPosition, bool setY)
3535
{
3636
Vector3 currentVertex = newPosition;
3737
if (currentVertex != parent._lastVertex)

STROOP/Tabs/MapTab/MapObjects/MapTapeMeasureObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public TapeHoverData(MapTapeMeasureObject parent)
2525

2626
public bool CanDrag() => parent.itemEnableDragging.Checked;
2727

28-
public void DragTo(Vector3 newPosition)
28+
public void DragTo(Vector3 newPosition, bool setY)
2929
{
3030
if (dragA)
3131
parent.a = new Vector2(newPosition.X, newPosition.Z);

STROOP/Tabs/MapTab/MapObjects/MapTriangleObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public TriangleHoverData(MapTriangleObject parent)
2222
this.parent = parent;
2323
}
2424

25-
public void DragTo(Vector3 position) { }
25+
public void DragTo(Vector3 position, bool setY) { }
2626

2727
public void LeftClick(Vector3 position) { }
2828

0 commit comments

Comments
 (0)