CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 13:10:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added proportional resizing with resize node support

Browse source
This commit is contained in:
Jaex 2017-11-20 21:25:18 +03:00
parent 1ba381e251
commit 8d41315c47
5 changed files with 54 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
ShareX.ScreenCaptureLib/Shapes/BaseShape.cs
View file

@ -100,6 +100,7 @@ private set
protected AnnotationOptions AnnotationOptions => Manager.Options.AnnotationOptions;
private Point tempNodePos, tempStartPos, tempEndPos;
private Rectangle tempRectangle;
public virtual bool Intersects(Point position)
{
@ -167,7 +168,10 @@ public virtual void OnCreating()
}
}
public virtual void OnCreated() { }
public virtual void OnCreated()
{
InitialSize = Rectangle.Size;
}
public virtual void OnMoving() { }
@ -256,8 +260,9 @@ public virtual void OnNodeUpdate()
if (!InputManager.IsBeforeMouseDown(MouseButtons.Left))
{
tempNodePos = node.Position;
tempStartPos = Rectangle.Location;
tempEndPos = new Point(Rectangle.X + Rectangle.Width - 1, Rectangle.Y + Rectangle.Height - 1);
tempStartPos = StartPosition;
tempEndPos = EndPosition;
tempRectangle = Rectangle;
OnResizing();
}
@ -267,6 +272,7 @@ public virtual void OnNodeUpdate()
tempStartPos.Offset(InputManager.MouseVelocity);
tempEndPos.Offset(InputManager.MouseVelocity);
tempNodePos.Offset(InputManager.MouseVelocity);
tempRectangle.LocationOffset(InputManager.MouseVelocity);
}
Point pos = InputManager.ClientMousePosition;
@ -313,24 +319,54 @@ public virtual void OnNodeUpdate()
if (Manager.IsProportionalResizing)
{
double ratio = Math.Min(Rectangle.Width / (double)InitialSize.Width, Rectangle.Height / (double)InitialSize.Height);
int width = (int)Math.Round(ratio * InitialSize.Width);
int height = (int)Math.Round(ratio * InitialSize.Height);
int newWidth = (int)Math.Round(InitialSize.Width * ratio);
int newHeight = (int)Math.Round(InitialSize.Height * ratio);
Point anchor = new Point();
switch (nodePosition)
{
case NodePosition.TopLeft:
case NodePosition.Left:
case NodePosition.BottomLeft:
anchor.X = tempRectangle.Right - 1;
break;
case NodePosition.TopRight:
case NodePosition.Right:
case NodePosition.BottomRight:
anchor.X = tempRectangle.X;
break;
}
switch (nodePosition)
{
case NodePosition.TopLeft:
case NodePosition.Top:
case NodePosition.TopRight:
anchor.Y = tempRectangle.Bottom - 1;
break;
case NodePosition.BottomLeft:
case NodePosition.Bottom:
case NodePosition.BottomRight:
anchor.Y = tempRectangle.Y;
break;
}
Rectangle newRect = Rectangle;
if (pos.X < tempStartPos.X)
if (pos.X < anchor.X)
{
newRect.X = newRect.Right - width;
newRect.X = newRect.Right - newWidth;
}
newRect.Width = width;
newRect.Width = newWidth;
if (pos.Y < tempStartPos.Y)
if (pos.Y < anchor.Y)
{
newRect.Y = newRect.Bottom - height;
newRect.Y = newRect.Bottom - newHeight;
}
newRect.Height = height;
newRect.Height = newHeight;
Rectangle = newRect;
}

1
ShareX.ScreenCaptureLib/Shapes/Drawing/ImageDrawingShape.cs
View file

@ -115,6 +115,7 @@ public override void OnCreating()
}
else
{
OnCreated();
ShowNodes();
}
}

4
ShareX.ScreenCaptureLib/Shapes/Drawing/ImageScreenDrawingShape.cs
View file

@ -80,6 +80,10 @@ public override void OnCreated()
{
Remove();
}
else
{
base.OnCreated();
}
}
public override void Dispose()

1
ShareX.ScreenCaptureLib/Shapes/Drawing/TextDrawingShape.cs
View file

@ -111,6 +111,7 @@ public override void OnCreating()
public override void OnCreated()
{
AutoSize(true);
base.OnCreated();
ShowNodes();
}

1
ShareX.ScreenCaptureLib/Shapes/Effect/BaseEffectShape.cs
View file

@ -113,6 +113,7 @@ public virtual void OnDrawFinal(Graphics g, Bitmap bmp)
public override void OnCreated()
{
base.OnCreated();
CacheEffect();
}