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

Use blue colors on info box for consistency with menu tooltips

Browse source
This commit is contained in:
Jaex 2016-10-13 17:11:14 +03:00
parent fc1e464e50
commit c6b4db04e0
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public Color CurrentColor
private TextureBrush backgroundBrush, backgroundHighlightBrush; private TextureBrush backgroundBrush, backgroundHighlightBrush;
private GraphicsPath regionFillPath, regionDrawPath; private GraphicsPath regionFillPath, regionDrawPath;
private Pen borderPen, borderDotPen, textBackgroundPenWhite, textBackgroundPenBlack, markerPen; private Pen borderPen, borderDotPen, textOuterBorderPen, textInnerBorderPen, markerPen;
private Brush nodeBackgroundBrush, textBackgroundBrush; private Brush nodeBackgroundBrush, textBackgroundBrush;
private Font infoFont, infoFontMedium, infoFontBig; private Font infoFont, infoFontMedium, infoFontBig;
private Stopwatch timerStart, timerFPS; private Stopwatch timerStart, timerFPS;
@ -112,9 +112,9 @@ public RegionCaptureForm(RegionCaptureMode mode)
infoFont = new Font("Verdana", 9); infoFont = new Font("Verdana", 9);
infoFontMedium = new Font("Verdana", 12); infoFontMedium = new Font("Verdana", 12);
infoFontBig = new Font("Verdana", 16, FontStyle.Bold); infoFontBig = new Font("Verdana", 16, FontStyle.Bold);
textBackgroundBrush = new SolidBrush(Color.FromArgb(75, Color.Black)); textBackgroundBrush = new SolidBrush(Color.FromArgb(175, Color.FromArgb(44, 135, 206)));
textBackgroundPenWhite = new Pen(Color.FromArgb(50, Color.White)); textOuterBorderPen = new Pen(Color.FromArgb(175, Color.White));
textBackgroundPenBlack = new Pen(Color.FromArgb(150, Color.Black)); textInnerBorderPen = new Pen(Color.FromArgb(175, Color.FromArgb(0, 81, 145)));
markerPen = new Pen(Color.FromArgb(200, Color.Red)); markerPen = new Pen(Color.FromArgb(200, Color.Red));
} }
@ -584,7 +584,7 @@ private void DrawFPS(Graphics g, int offset)
private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, int padding) private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, int padding)
{ {
DrawInfoText(g, text, rect, font, padding, textBackgroundBrush, textBackgroundPenWhite, textBackgroundPenBlack, Brushes.White, Brushes.Black); 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, private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, int padding,
@ -599,7 +599,7 @@ private void DrawInfoText(Graphics g, string text, Rectangle rect, Font font, in
private void DrawAreaText(Graphics g, string text, Rectangle area) private void DrawAreaText(Graphics g, string text, Rectangle area)
{ {
int offset = 5; int offset = 6;
int backgroundPadding = 3; int backgroundPadding = 3;
Size textSize = g.MeasureString(text, infoFont).ToSize(); Size textSize = g.MeasureString(text, infoFont).ToSize();
Point textPos; Point textPos;
@ -1144,8 +1144,8 @@ protected override void Dispose(bool disposing)
if (infoFontMedium != null) infoFontMedium.Dispose(); if (infoFontMedium != null) infoFontMedium.Dispose();
if (infoFontBig != null) infoFontBig.Dispose(); if (infoFontBig != null) infoFontBig.Dispose();
if (textBackgroundBrush != null) textBackgroundBrush.Dispose(); if (textBackgroundBrush != null) textBackgroundBrush.Dispose();
if (textBackgroundPenWhite != null) textBackgroundPenWhite.Dispose(); if (textOuterBorderPen != null) textOuterBorderPen.Dispose();
if (textBackgroundPenBlack != null) textBackgroundPenBlack.Dispose(); if (textInnerBorderPen != null) textInnerBorderPen.Dispose();
if (markerPen != null) markerPen.Dispose(); if (markerPen != null) markerPen.Dispose();
if (regionFillPath != null) if (regionFillPath != null)

2
ShareX.ScreenCaptureLib/RegionCaptureOptions.cs
View file

@ -47,7 +47,7 @@ public class RegionCaptureOptions
public bool DetectControls = true; public bool DetectControls = true;
public bool UseDimming = true; public bool UseDimming = true;
public bool UseCustomInfoText = false; public bool UseCustomInfoText = false;
public string CustomInfoText = "X: $x, Y: $y$nR: $r, G: $g, B: $b$nHex: $hex"; // Formats: $x, $y, $r, $g, $b, $hex, $n public string CustomInfoText = "X: $x, Y: $y$nR: $r, G: $g, B: $b$nHex: $hex"; // Formats: $x, $y, $r, $g, $b, $hex, $HEX, $n
public List<SnapSize> SnapSizes = new List<SnapSize>() public List<SnapSize> SnapSizes = new List<SnapSize>()
{ {
new SnapSize(426, 240), // 240p new SnapSize(426, 240), // 240p