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

On screen color picker add color box near cursor tooltip

Browse source
This commit is contained in:
Jaex 2018-04-26 20:17:02 +03:00
parent eddc71bd63
commit a9bcb02e0e
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View file

@ -911,18 +911,29 @@ private void DrawFPS(Graphics g, int offset)
}
private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, int padding)
{
DrawInfoText(g, text, rect, font, new Point(padding, padding));
}
private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, Point padding)
{
DrawInfoText(g, text, rect, font, padding, textBackgroundBrush, textOuterBorderPen, textInnerBorderPen, Brushes.White, Brushes.Black);
}
private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, int padding,
Brush backgroundBrush, Pen outerBorderPen, Pen innerBorderPen, Brush textBrush, Brush textShadowBrush)
{
DrawInfoText(g, text, rect, font, new Point(padding, padding), backgroundBrush, outerBorderPen, innerBorderPen, textBrush, textShadowBrush);
}
private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, Point padding,
Brush backgroundBrush, Pen outerBorderPen, Pen innerBorderPen, Brush textBrush, Brush textShadowBrush)
{
g.FillRectangle(backgroundBrush, rect.Offset(-2));
g.DrawRectangleProper(innerBorderPen, rect.Offset(-1));
g.DrawRectangleProper(outerBorderPen, rect);
g.DrawTextWithShadow(text, rect.Offset(-padding).Location, font, textBrush, textShadowBrush);
g.DrawTextWithShadow(text, rect.LocationOffset(padding.X, padding.Y).Location, font, textBrush, textShadowBrush);
}
internal void DrawAreaText(Graphics g, string text, Rectangle area)
@ -1137,7 +1148,31 @@ private void DrawCursorGraphics(Graphics g)
if (Options.ShowInfo)
{
infoTextRect.Location = new Point(x + (totalSize.Width / 2) - (infoTextRect.Width / 2), y + infoTextPosition);
DrawInfoText(g, infoText, infoTextRect, infoFont, infoTextPadding);
Point padding = new Point(infoTextPadding, infoTextPadding);
Rectangle colorRect = Rectangle.Empty;
if (Mode == RegionCaptureMode.ScreenColorPicker)
{
int colorBoxOffset = 3;
int colorBoxWidth = 15;
colorRect = new Rectangle(infoTextRect.X + colorBoxOffset, infoTextRect.Y + colorBoxOffset, colorBoxWidth, infoTextRect.Height - colorBoxOffset * 2);
int colorExtraWidth = colorRect.Width + colorBoxOffset;
infoTextRect.Width += colorExtraWidth;
padding.X += colorExtraWidth;
}
DrawInfoText(g, infoText, infoTextRect, infoFont, padding);
if (Mode == RegionCaptureMode.ScreenColorPicker)
{
using (Brush colorBrush = new SolidBrush(CurrentColor))
{
g.FillRectangle(colorBrush, colorRect);
}
g.DrawRectangleProper(Pens.White, colorRect);
}
}
}