Changed mouse actions
This commit is contained in:
Родитель
bab47e9299
Коммит
e0423d5c31
|
@ -371,8 +371,6 @@ namespace SpiroNet.Editor
|
|||
NewPointAt(shape, x, y, index);
|
||||
|
||||
RunSpiro(shape);
|
||||
|
||||
Deselect();
|
||||
}
|
||||
|
||||
private void RemovePoint(PathShape shape, int index)
|
||||
|
@ -386,7 +384,6 @@ namespace SpiroNet.Editor
|
|||
else
|
||||
{
|
||||
RunSpiro(shape);
|
||||
_invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -395,8 +392,6 @@ namespace SpiroNet.Editor
|
|||
_drawing.Shapes.Remove(shape);
|
||||
_data.Remove(shape);
|
||||
_knots.Remove(shape);
|
||||
|
||||
_invalidate();
|
||||
}
|
||||
|
||||
private void Delete(double x, double y)
|
||||
|
@ -525,11 +520,24 @@ namespace SpiroNet.Editor
|
|||
}
|
||||
|
||||
public void MiddleDown(double x, double y)
|
||||
{
|
||||
if (_state.Shape == null)
|
||||
{
|
||||
Delete(x, y);
|
||||
Deselect();
|
||||
}
|
||||
}
|
||||
|
||||
public void RightDown(double x, double y)
|
||||
{
|
||||
double sx = _state.EnableSnap ? Snap(x, _state.SnapX) : x;
|
||||
double sy = _state.EnableSnap ? Snap(y, _state.SnapY) : y;
|
||||
|
||||
if (_state.Shape == null)
|
||||
if (_state.Shape != null)
|
||||
{
|
||||
Finish();
|
||||
}
|
||||
else
|
||||
{
|
||||
PathShape hitShape;
|
||||
int hitShapePointIndex;
|
||||
|
@ -538,34 +546,17 @@ namespace SpiroNet.Editor
|
|||
if (HitTestForShape(_drawing.Shapes, x, y, _state.HitTreshold, out hitShape, out hitShapePointIndex))
|
||||
{
|
||||
InsertPoint(sx, sy, hitShape, hitShapePointIndex);
|
||||
_invalidate();
|
||||
return;
|
||||
}
|
||||
|
||||
if (_state.HitShape != null)
|
||||
{
|
||||
Deselect();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void RightDown(double x, double y)
|
||||
{
|
||||
if (_state.Shape != null)
|
||||
{
|
||||
Finish();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_state.HitShape != null)
|
||||
{
|
||||
Deselect();
|
||||
}
|
||||
|
||||
Delete(x, y);
|
||||
}
|
||||
}
|
||||
|
||||
public void Move(double x, double y)
|
||||
{
|
||||
double sx = _state.EnableSnap ? Snap(x, _state.SnapX) : x;
|
||||
|
|
|
@ -359,10 +359,10 @@
|
|||
<TextBlock Text="- Move Point" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="Mouse Right" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="- Finish Shape" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="- Insert Point" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="Mouse Middle:" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="- Remove Shape" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="- Remove Point" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="Mouse Middle:" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
<TextBlock Text="- Insert Point" TextAlignment="Left" Margin="4,0,4,0"/>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
|
|
Загрузка…
Ссылка в новой задаче