CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Added rounded rectangle and triangle capture tips

Browse source
This commit is contained in:
Jaex 2015-05-06 20:14:45 +03:00
parent 228b8bd9bf
commit 4b0c6abaf3
3 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs
View file

@ -293,18 +293,44 @@ protected override void Draw(Graphics g)
private void DrawTips(Graphics g, int offset, int padding)
{
StringBuilder sb = new StringBuilder();
WriteTips(sb);
string tipText = sb.ToString().Trim();
Size textSize = g.MeasureString(tipText, tipFont).ToSize();
int rectWidth = textSize.Width + padding * 2 + 2;
int rectHeight = textSize.Height + padding * 2;
Rectangle primaryScreenBounds = CaptureHelpers.GetPrimaryScreenBounds0Based();
Rectangle textRectangle = new Rectangle(primaryScreenBounds.X + primaryScreenBounds.Width - rectWidth - offset, primaryScreenBounds.Y + offset, rectWidth, rectHeight);
if (textRectangle.Offset(10).Contains(InputManager.MousePosition0Based))
{
textRectangle.Y = primaryScreenBounds.Height - rectHeight - offset;
}
using (Brush brush = new SolidBrush(Color.FromArgb(175, Color.Black)))
using (Pen pen = new Pen(Color.FromArgb(175, Color.White)))
{
g.DrawRoundedRectangle(brush, pen, textRectangle, 5);
}
textRectangle.Inflate(-padding, -padding);
g.DrawString(tipText, tipFont, Brushes.White, textRectangle);
}
protected virtual void WriteTips(StringBuilder sb)
{
sb.AppendLine("[F1] Hide this tips");
sb.AppendLine();
if (AreaManager.IsCreating)
{
sb.AppendLine("[Esc] Cancel capture");
sb.AppendLine("[Right click] Cancel region selection");
sb.AppendLine("[Esc] Cancel capture");
}
else
{
sb.AppendLine("[Right click] [Esc] Cancel capture");
sb.AppendLine("[Hold Left click] Start region selection");
sb.AppendLine("[Right click] [Esc] Cancel capture");
}
if (!Config.QuickCrop && AreaManager.Areas.Count > 0)
@ -361,28 +387,6 @@ private void DrawTips(Graphics g, int offset, int padding)
sb.AppendLine(string.Format("[I] {0} coordinate and size info", Config.ShowInfo ? "Hide" : "Show"));
sb.AppendLine(string.Format("[M] {0} magnifier", Config.ShowMagnifier ? "Hide" : "Show"));
sb.AppendLine(string.Format("[C] {0} screen wide crosshair", Config.ShowCrosshair ? "Hide" : "Show"));
string tipText = sb.ToString().Trim();
Size textSize = g.MeasureString(tipText, tipFont).ToSize();
int rectWidth = textSize.Width + padding * 2 + 2;
int rectHeight = textSize.Height + padding * 2;
Rectangle primaryScreenBounds = CaptureHelpers.GetPrimaryScreenBounds0Based();
Rectangle textRectangle = new Rectangle(primaryScreenBounds.X + primaryScreenBounds.Width - rectWidth - offset, primaryScreenBounds.Y + offset, rectWidth, rectHeight);
if (textRectangle.Offset(10).Contains(InputManager.MousePosition0Based))
{
textRectangle.Y = primaryScreenBounds.Height - rectHeight - offset;
}
using (Brush brush = new SolidBrush(Color.FromArgb(175, Color.Black)))
using (Pen pen = new Pen(Color.FromArgb(175, Color.White)))
{
g.DrawRoundedRectangle(brush, pen, textRectangle, 5);
}
textRectangle.Inflate(-padding, -padding);
g.DrawString(tipText, tipFont, Brushes.White, textRectangle);
}
private string GetRulerText(Rectangle area)

8
ShareX.ScreenCaptureLib/Forms/RoundedRectangleRegion.cs
View file

@ -27,6 +27,7 @@ You should have received a copy of the GNU General Public License
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Text;
using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
@ -59,5 +60,12 @@ protected override void AddShapePath(GraphicsPath graphicsPath, Rectangle rect)
{
graphicsPath.AddRoundedRectangle(rect, Radius);
}
protected override void WriteTips(StringBuilder sb)
{
base.WriteTips(sb);
sb.AppendLine("[Numpad +] [Numpad -] Change corner radius");
}
}
}

8
ShareX.ScreenCaptureLib/Forms/TriangleRegion.cs
View file

@ -26,6 +26,7 @@ You should have received a copy of the GNU General Public License
using ShareX.HelpersLib;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Text;
using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
@ -70,5 +71,12 @@ protected override void AddShapePath(GraphicsPath graphicsPath, Rectangle rect)
{
graphicsPath.AddTriangle(rect, Angle);
}
protected override void WriteTips(StringBuilder sb)
{
base.WriteTips(sb);
sb.AppendLine("[Numpad +] [Numpad -] Change triangle angle");
}
}
}