From 9adf3fab08adbb67de71693f165dc6ffc560a43e Mon Sep 17 00:00:00 2001 From: F K <54195004+fredjk-gh@users.noreply.github.com> Date: Thu, 29 Feb 2024 19:51:40 -0500 Subject: [PATCH] [Core] Visual improvements to notifications (#144) * [Core] Visual improvements to notifications - Notification title was previously missing; it's back! - Fixed window and label backgrounds to be correctly/consistently transparent. The click-thru bit is only partially working (transparent areas are click-thru). * [Core] Reduce notification font size to avoid wrapping Now that titles work, I noticed a few notification titles were wrapping. Examples: - System Discovery Complete (from Evaluator) - Minimum Distance Reached (from BioInsights) To address, I made the following adjustments: * Made the test notification title longer by adding the word "Popup" so it is now "Test Popup Notification". * Reduced the Title font size to 20 (from 24). * Moved the content box up to close the gap a bit. * [Core] Exclude the notification popup colour picker button from themes Noticed it was not the colour it should be and thought the setting was always being reset -- turns out the setting was correct, the button colour was not. Here's a quick hack to fix. * [Core] Further notification title tweaking Now "System Discovery Complete" *actually* fits. * [Core] Widen the native pop-up font selector so you can see variants The previous width was a little bit narrow for the family of fonts like Segoe UI Variable... The new width is 2x the original size and fits all fonts on my system and should do the trick for the moment. --- ObservatoryCore/UI/CoreForm.Designer.cs | 2 +- ObservatoryCore/UI/CoreForm.cs | 2 +- ObservatoryCore/UI/NotificationForm.Designer.cs | 12 +++++++----- ObservatoryCore/UI/NotificationForm.cs | 4 ++-- ObservatoryCore/UI/ThemeManager.cs | 5 +++++ 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ObservatoryCore/UI/CoreForm.Designer.cs b/ObservatoryCore/UI/CoreForm.Designer.cs index 81c0cc4..b7779a9 100644 --- a/ObservatoryCore/UI/CoreForm.Designer.cs +++ b/ObservatoryCore/UI/CoreForm.Designer.cs @@ -402,7 +402,7 @@ FontDropdown.FormattingEnabled = true; FontDropdown.Location = new Point(120, 65); FontDropdown.Name = "FontDropdown"; - FontDropdown.Size = new Size(121, 23); + FontDropdown.Size = new Size(242, 23); FontDropdown.TabIndex = 5; FontDropdown.SelectedIndexChanged += FontDropdown_SelectedIndexChanged; // diff --git a/ObservatoryCore/UI/CoreForm.cs b/ObservatoryCore/UI/CoreForm.cs index 1b17180..5f01dc8 100644 --- a/ObservatoryCore/UI/CoreForm.cs +++ b/ObservatoryCore/UI/CoreForm.cs @@ -264,7 +264,7 @@ namespace Observatory.UI { NotificationArgs args = new() { - Title = "Test Notification", + Title = "Test Popup Notification", Detail = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec at elit maximus, ornare dui nec, accumsan velit. Vestibulum fringilla elit." }; diff --git a/ObservatoryCore/UI/NotificationForm.Designer.cs b/ObservatoryCore/UI/NotificationForm.Designer.cs index f6cbb0c..0b2713b 100644 --- a/ObservatoryCore/UI/NotificationForm.Designer.cs +++ b/ObservatoryCore/UI/NotificationForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Observatory.UI +namespace Observatory.UI { partial class NotificationForm { @@ -34,14 +34,15 @@ // // Title // - Title.Font = new Font("Segoe UI", 24F, FontStyle.Regular, GraphicsUnit.Point); + Title.Font = new Font("Segoe UI", 18F, FontStyle.Regular, GraphicsUnit.Point); Title.ForeColor = Color.OrangeRed; Title.Location = new Point(5, 5); - Title.MaximumSize = new Size(355, 0); + Title.MaximumSize = new Size(345, 45); Title.Name = "Title"; - Title.Size = new Size(338, 45); + Title.Size = new Size(338, 35); Title.TabIndex = 0; Title.Text = "Title"; + Title.UseCompatibleTextRendering = true; // // Body // @@ -49,7 +50,7 @@ Body.AutoSize = true; Body.Font = new Font("Segoe UI", 14.25F, FontStyle.Regular, GraphicsUnit.Point); Body.ForeColor = Color.OrangeRed; - Body.Location = new Point(12, 45); + Body.Location = new Point(12, 40); Body.MaximumSize = new Size(320, 85); Body.Name = "Body"; Body.Size = new Size(51, 31); @@ -74,6 +75,7 @@ ShowIcon = false; ShowInTaskbar = false; Text = "NotificationForm"; + TransparencyKey = Color.FromArgb(64, 64, 64); ResumeLayout(false); PerformLayout(); } diff --git a/ObservatoryCore/UI/NotificationForm.cs b/ObservatoryCore/UI/NotificationForm.cs index 27c0b7b..5ed914e 100644 --- a/ObservatoryCore/UI/NotificationForm.cs +++ b/ObservatoryCore/UI/NotificationForm.cs @@ -62,7 +62,7 @@ namespace Observatory.UI Title.ForeColor = _color; Title.Text = args.Title; - Title.Font = new Font(Properties.Core.Default.NativeNotifyFont, 24); + Title.Font = new Font(Properties.Core.Default.NativeNotifyFont, 18); Body.ForeColor = _color; Body.Text = args.Detail; Body.Font = new Font(Properties.Core.Default.NativeNotifyFont, 14); @@ -203,7 +203,7 @@ namespace Observatory.UI if (sender != null) { var label = (Label)sender; - e.Graphics.Clear(Color.Transparent); + e.Graphics.Clear(Color.FromArgb(64, 64, 64)); using (var sf = new StringFormat()) using (var brush = new SolidBrush(label.ForeColor)) { diff --git a/ObservatoryCore/UI/ThemeManager.cs b/ObservatoryCore/UI/ThemeManager.cs index c6460ca..5ef8c53 100644 --- a/ObservatoryCore/UI/ThemeManager.cs +++ b/ObservatoryCore/UI/ThemeManager.cs @@ -16,6 +16,10 @@ namespace Observatory.UI return _instance.Value; } } + private static HashSet _excludedControlNames = new() + { + "ColourButton", + }; private static readonly Lazy _instance = new(() => new ThemeManager()); private bool _init; @@ -70,6 +74,7 @@ namespace Observatory.UI if (control.HasChildren) foreach (Control child in control.Controls) { + if (_excludedControlNames.Contains(child.Name)) continue; RegisterControl(child); } }