Two new options, min. to taskbar + topmost. reduce form flicker.

voltura · Nov 22, 2022 · 0d23d68 · 0d23d68
1 parent c578438
commit 0d23d68
Show file tree

Hide file tree

Showing 14 changed files with 273 additions and 163 deletions.
diff --git a/EarnerApp/Forms/AboutForm.cs b/EarnerApp/Forms/AboutForm.cs
@@ -34,6 +34,17 @@ public AboutForm()
 
         #region Private methods
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;  // Turn on WS_EX_COMPOSITED
+                return cp;
+            }
+        }
+
+
         private void LoadAppSettings()
         {
             _Settings.Load();

diff --git a/EarnerApp/Forms/ConfirmForm.cs b/EarnerApp/Forms/ConfirmForm.cs
@@ -53,6 +53,17 @@ private void SetTooltips()
 
         #region Private events
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;  // Turn on WS_EX_COMPOSITED
+                return cp;
+            }
+        }
+
+
         private void YesClick(object sender, EventArgs e)
         {
             Log.LogCaller();

diff --git a/EarnerApp/Forms/EarnerForm.Designer.cs b/EarnerApp/Forms/EarnerForm.Designer.cs
diff --git a/EarnerApp/Forms/EarnerForm.cs b/EarnerApp/Forms/EarnerForm.cs
@@ -35,6 +35,8 @@ public partial class EarnerForm : Form
 
         private string _InternetVersion = string.Empty;
 
+        private readonly NotifyIcon _NotifyIcon;
+
         #endregion Private variables
 
         #region Constructor
@@ -46,7 +48,15 @@ public EarnerForm()
             _EarnerRecords = EarnerRecords.Instance;
             InitializeComponent();
             _lblEarnerHeader.Text = $"{Application.ProductName} {Application.ProductVersion}";
+            _NotifyIcon = new()
+            {
+                Icon = Resources.dollar,
+                Visible = _Settings.MinimizeToTaskbar
+            };
+            _NotifyIcon.Click += NotifyIconClick;
+            _NotifyIcon.MouseClick += NotifyIconClick;
             LoadAppSettings();
+            ShowInTaskbar = !_Settings.MinimizeToTaskbar;
             StartEarning();
         }
 
@@ -61,6 +71,8 @@ private void LoadAppSettings()
             _ActiveTask = _Settings.Tasks.FirstOrDefault("Default Task");
             _lblActiveTask.Text = $"Working with {_ActiveTask}";
             _pbWorkProgress.Visible = _Settings.ShowProgressbar;
+            TopMost = _Settings.StayOnTop;
+            _NotifyIcon.Visible = _Settings.MinimizeToTaskbar;
         }
 
         private void SetTooltips()
@@ -111,6 +123,7 @@ private void StartEarning()
                 }
                 finally
                 {
+                    ShowInTaskbar = !_Settings.MinimizeToTaskbar;
                     Visible = true;
                 }
             }
@@ -334,6 +347,7 @@ private void OptionsClick(object sender, EventArgs e)
             }
             finally
             {
+                ShowInTaskbar = !_Settings.MinimizeToTaskbar;
                 Visible = true;
             }
             if (sfDialogResult == DialogResult.OK)
@@ -382,6 +396,16 @@ private void Tick(object sender, EventArgs e)
             }
         }
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;  // Turn on WS_EX_COMPOSITED
+                return cp;
+            }
+        }
+
         private void HideClick(object sender, EventArgs e)
         {
             if (_btnHide.Tag != null && _btnHide.Tag.ToString() == "Update")
@@ -393,7 +417,40 @@ private void HideClick(object sender, EventArgs e)
             }
 
             _DoNotChangeFontSize = true;
-            WindowState = FormWindowState.Minimized;
+            if (WindowState != FormWindowState.Minimized)
+            {
+                WindowState = FormWindowState.Minimized;
+            }
+
+            if (_Settings.MinimizeToTaskbar)
+            {
+                if (Visible)
+                {
+                    Hide();
+                }
+
+                if (!_NotifyIcon.Visible)
+                {
+                    _NotifyIcon.Visible = true;
+                }
+            }
+            else
+            {
+                if (!Visible)
+                {
+                    Visible = true;
+                }
+
+                if (_NotifyIcon.Visible)
+                {
+                    _NotifyIcon.Visible = false;
+                }
+
+                if (!ShowInTaskbar)
+                {
+                    ShowInTaskbar = true;
+                }
+            }
         }
 
         private void TopPanelMouseDown(object sender, MouseEventArgs e)
@@ -491,6 +548,12 @@ private void ScaleTextChanged(object sender, EventArgs e)
         private void EarnerFormResize(object sender, EventArgs e)
         {
             _DoNotChangeFontSize = WindowState == FormWindowState.Minimized;
+            if (WindowState == FormWindowState.Minimized && _NotifyIcon is not null)
+            {
+                ShowInTaskbar = false;
+                _NotifyIcon.Visible = true;
+                Visible = false;
+            }
         }
 
         private void EarnerFormKeyDown(object sender, KeyEventArgs e)
@@ -546,6 +609,14 @@ private void EarnerFormShown(object sender, EventArgs e)
             GetAndDisplayUpdateInfoInHeader();
         }
 
+        private void NotifyIconClick(object? sender, EventArgs e)
+        {
+            WindowState = FormWindowState.Normal;
+            Show();
+            _ = Focus();
+            ShowInTaskbar = !_Settings.MinimizeToTaskbar;
+        }
+
         #endregion Private events
     }
 }
diff --git a/EarnerApp/Forms/LogAdminForm.cs b/EarnerApp/Forms/LogAdminForm.cs
@@ -67,6 +67,17 @@ private void PopulateDatagrid()
 
         #region Private methods
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;  // Turn on WS_EX_COMPOSITED
+                return cp;
+            }
+        }
+
+
         private void SetTooltips()
         {
             if (_Settings.ShowTooltips)
@@ -83,6 +94,16 @@ private void SetTooltips()
             }
         }
 
+        private void EarnerRecordsDefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
+        {
+            e.Row.Cells[0].Value = $"Task_{DateTime.Now.Ticks.ToString()[10..]}";
+            e.Row.Cells[1].Value = "0";
+            e.Row.Cells[2].Value = DateTime.Now.ToString("yyyy-MM-dd");
+            e.Row.Cells[3].Value = "0";
+            e.Row.Cells[4].Value = _Settings.CurrencySymbol;
+            e.Row.Cells[5].Value = Math.Round(_Settings.HourlyRate, 2, MidpointRounding.AwayFromZero).ToString();
+        }
+
         #endregion Private methods
 
         #region Private events
@@ -309,15 +330,5 @@ private void EarnerRecordsCellValidating(object sender, DataGridViewCellValidati
         }
 
         #endregion Private events
-
-        private void EarnerRecordsDefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
-        {
-            e.Row.Cells[0].Value = $"Task_{DateTime.Now.Ticks.ToString()[10..]}";
-            e.Row.Cells[1].Value = "0";
-            e.Row.Cells[2].Value = DateTime.Now.ToString("yyyy-MM-dd");
-            e.Row.Cells[3].Value = "0";
-            e.Row.Cells[4].Value = _Settings.CurrencySymbol;
-            e.Row.Cells[5].Value = Math.Round(_Settings.HourlyRate, 2, MidpointRounding.AwayFromZero).ToString();
-        }
     }
 }
diff --git a/EarnerApp/Forms/LogPeriodForm.cs b/EarnerApp/Forms/LogPeriodForm.cs
@@ -39,6 +39,16 @@ public LogPeriodForm()
 
         #region Private methods
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;  // Turn on WS_EX_COMPOSITED
+                return cp;
+            }
+        }
+
         private void LoadAppSettings()
         {
             _Settings.Load();