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

Support dark theme in notification form

Browse source
This commit is contained in:
Jaex 2019-06-01 22:15:51 +03:00
parent 35d6f5aaed
commit 0d5284038a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX.HelpersLib/Helpers/ImageHelpers.cs
View file

@ -690,7 +690,6 @@ public static Bitmap FillBackground(Image img, Brush brush)
using (img) using (img)
{ {
g.FillRectangle(brush, 0, 0, result.Width, result.Height); g.FillRectangle(brush, 0, 0, result.Width, result.Height);
g.SetHighQuality();
g.DrawImage(img, 0, 0, result.Width, result.Height); g.DrawImage(img, 0, 0, result.Width, result.Height);
} }

17
ShareX/Forms/NotificationForm.cs
View file

@ -75,12 +75,13 @@ public NotificationForm(int duration, int fadeDuration, ContentAlignment placeme
if (config.Image != null) if (config.Image != null)
{ {
config.Image = ImageHelpers.ResizeImageLimit(config.Image, size); config.Image = ImageHelpers.ResizeImageLimit(config.Image, size);
config.Image = ImageHelpers.DrawCheckers(config.Image); Color backgroundColor = ShareXResources.UseDarkTheme ? ShareXResources.DarkBackgroundColor : SystemColors.Window;
config.Image = ImageHelpers.FillBackground(config.Image, backgroundColor);
size = new Size(config.Image.Width + 2, config.Image.Height + 2); size = new Size(config.Image.Width + 2, config.Image.Height + 2);
} }
else if (!string.IsNullOrEmpty(config.Text)) else if (!string.IsNullOrEmpty(config.Text))
{ {
textRenderSize = TextRenderer.MeasureText(config.Text, textFont, size.Offset(-textPadding * 2), TextFormatFlags.Left); textRenderSize = TextRenderer.MeasureText(config.Text, textFont, size.Offset(-textPadding * 2), TextFormatFlags.Left | TextFormatFlags.EndEllipsis);
size = new Size(textRenderSize.Width + (textPadding * 2), textRenderSize.Height + (textPadding * 2) + 2); size = new Size(textRenderSize.Width + (textPadding * 2), textRenderSize.Height + (textPadding * 2) + 2);
} }
@ -161,7 +162,7 @@ protected override void OnPaint(PaintEventArgs e)
g.FillRectangle(brush, textRect); g.FillRectangle(brush, textRect);
} }
TextRenderer.DrawText(g, ToastConfig.URL, textFont, textRect.Offset(-urlPadding), Color.White, TextFormatFlags.Left); TextRenderer.DrawText(g, ToastConfig.URL, textFont, textRect.Offset(-urlPadding), Color.White, TextFormatFlags.Left | TextFormatFlags.EndEllipsis);
} }
} }
else if (!string.IsNullOrEmpty(ToastConfig.Text)) else if (!string.IsNullOrEmpty(ToastConfig.Text))
@ -172,11 +173,15 @@ protected override void OnPaint(PaintEventArgs e)
} }
Rectangle textRect = new Rectangle(textPadding, textPadding, textRenderSize.Width + 2, textRenderSize.Height + 2); Rectangle textRect = new Rectangle(textPadding, textPadding, textRenderSize.Width + 2, textRenderSize.Height + 2);
TextRenderer.DrawText(g, ToastConfig.Text, textFont, textRect, Color.Black, TextFormatFlags.Left); TextRenderer.DrawText(g, ToastConfig.Text, textFont, textRect, Color.Black, TextFormatFlags.Left | TextFormatFlags.EndEllipsis);
TextRenderer.DrawText(g, ToastConfig.Text, textFont, textRect.LocationOffset(1), Color.White, TextFormatFlags.Left); TextRenderer.DrawText(g, ToastConfig.Text, textFont, textRect.LocationOffset(1), Color.White, TextFormatFlags.Left | TextFormatFlags.EndEllipsis);
} }
g.DrawRectangleProper(Pens.Black, rect); Color borderColor = ShareXResources.UseDarkTheme ? ShareXResources.DarkBorderColor : SystemColors.WindowText;
using (Pen borderPen = new Pen(borderColor))
{
g.DrawRectangleProper(borderPen, rect);
}
} }
public static void Show(int duration, int fadeDuration, ContentAlignment placement, Size size, NotificationFormConfig config) public static void Show(int duration, int fadeDuration, ContentAlignment placement, Size size, NotificationFormConfig config)