From c6b4db04e07f819d011f60b7f77de05fe369dd12 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 13 Oct 2016 17:11:14 +0300 Subject: [PATCH] Use blue colors on info box for consistency with menu tooltips --- .../Forms/RegionCaptureForm.cs | 16 ++++++++-------- ShareX.ScreenCaptureLib/RegionCaptureOptions.cs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs index c1397d697..0f125bbde 100644 --- a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs @@ -81,7 +81,7 @@ public Color CurrentColor private TextureBrush backgroundBrush, backgroundHighlightBrush; private GraphicsPath regionFillPath, regionDrawPath; - private Pen borderPen, borderDotPen, textBackgroundPenWhite, textBackgroundPenBlack, markerPen; + private Pen borderPen, borderDotPen, textOuterBorderPen, textInnerBorderPen, markerPen; private Brush nodeBackgroundBrush, textBackgroundBrush; private Font infoFont, infoFontMedium, infoFontBig; private Stopwatch timerStart, timerFPS; @@ -112,9 +112,9 @@ public RegionCaptureForm(RegionCaptureMode mode) infoFont = new Font("Verdana", 9); infoFontMedium = new Font("Verdana", 12); infoFontBig = new Font("Verdana", 16, FontStyle.Bold); - textBackgroundBrush = new SolidBrush(Color.FromArgb(75, Color.Black)); - textBackgroundPenWhite = new Pen(Color.FromArgb(50, Color.White)); - textBackgroundPenBlack = new Pen(Color.FromArgb(150, Color.Black)); + textBackgroundBrush = new SolidBrush(Color.FromArgb(175, Color.FromArgb(44, 135, 206))); + textOuterBorderPen = new Pen(Color.FromArgb(175, Color.White)); + textInnerBorderPen = new Pen(Color.FromArgb(175, Color.FromArgb(0, 81, 145))); 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) { - 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, @@ -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) { - int offset = 5; + int offset = 6; int backgroundPadding = 3; Size textSize = g.MeasureString(text, infoFont).ToSize(); Point textPos; @@ -1144,8 +1144,8 @@ protected override void Dispose(bool disposing) if (infoFontMedium != null) infoFontMedium.Dispose(); if (infoFontBig != null) infoFontBig.Dispose(); if (textBackgroundBrush != null) textBackgroundBrush.Dispose(); - if (textBackgroundPenWhite != null) textBackgroundPenWhite.Dispose(); - if (textBackgroundPenBlack != null) textBackgroundPenBlack.Dispose(); + if (textOuterBorderPen != null) textOuterBorderPen.Dispose(); + if (textInnerBorderPen != null) textInnerBorderPen.Dispose(); if (markerPen != null) markerPen.Dispose(); if (regionFillPath != null) diff --git a/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs b/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs index 8b69efa0e..023a778ee 100644 --- a/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs +++ b/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs @@ -47,7 +47,7 @@ public class RegionCaptureOptions public bool DetectControls = true; public bool UseDimming = true; 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 SnapSizes = new List() { new SnapSize(426, 240), // 240p