Change tray highlight to trigger on any notification and reset on win…

…dow focus Closes #33
chylex · Jul 27, 2016 · 41a45a1 · 41a45a1
1 parent 5d3721a
commit 41a45a1
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 32 deletions.
diff --git a/Configuration/UserConfig.cs b/Configuration/UserConfig.cs
@@ -16,7 +16,7 @@ sealed class UserConfig{
             Binder = new SerializationCompatibilityHandler()
         };
 
-        private const int CurrentFileVersion = 3;
+        private const int CurrentFileVersion = 4;
 
         // START OF CONFIGURATION
 
@@ -33,9 +33,11 @@ sealed class UserConfig{
         public int NotificationDisplay { get; set; }
         public bool NotificationLegacyLoad { get; set; }
 
+        public bool ExpandLinksOnHover { get; set; }
+        public bool EnableTrayHighlight { get; set; }
+
         public bool EnableUpdateCheck { get; set; }
         public string DismissedUpdate { get; set; }
-        public bool ExpandLinksOnHover { get; set; }
 
         public PluginConfig Plugins { get; private set; }
         public WindowState PluginsWindow { get; set; }
@@ -104,6 +106,7 @@ sealed class UserConfig{
             NotificationEdgeDistance = 8;
             EnableUpdateCheck = true;
             ExpandLinksOnHover = true;
+            EnableTrayHighlight = true;
             Plugins = new PluginConfig();
             PluginsWindow = new WindowState();
         }
@@ -132,6 +135,11 @@ sealed class UserConfig{
                 ++fileVersion;
             }
 
+            if (fileVersion == 3){
+                EnableTrayHighlight = true;
+                ++fileVersion;
+            }
+
             // update the version
             fileVersion = CurrentFileVersion;
             Save();

diff --git a/Core/FormBrowser.Designer.cs b/Core/FormBrowser.Designer.cs
diff --git a/Core/FormBrowser.cs b/Core/FormBrowser.cs
@@ -82,7 +82,7 @@ sealed partial class FormBrowser : Form{
         }
 
         public FormNotification CreateNotificationForm(bool autoHide){
-            return new FormNotification(this,plugins,trayIcon,autoHide);
+            return new FormNotification(this,plugins,autoHide);
         }
 
         // window setup
@@ -117,6 +117,12 @@ sealed partial class FormBrowser : Form{
             }
         }
 
+        private void FormBrowser_Activated(object sender, EventArgs e){
+            if (!isLoaded)return;
+
+            trayIcon.HasNotifications = false;
+        }
+
         private void FormBrowser_Resize(object sender, EventArgs e){
             if (!isLoaded)return;
 
@@ -234,6 +240,10 @@ sealed partial class FormBrowser : Form{
                         Config.Save();
                         updates.Check(false);
                     }
+
+                    if (!Config.EnableTrayHighlight){
+                        trayIcon.HasNotifications = false;
+                    }
                 };
 
                 ShowChildForm(currentFormSettings);
@@ -262,8 +272,10 @@ sealed partial class FormBrowser : Form{
             }
         }
 
-        public void OnTweetSound(){
-
+        public void OnTweetNotification(){
+            if (Config.EnableTrayHighlight && !ContainsFocus){
+                trayIcon.HasNotifications = true;
+            }
         }
 
         public void DisplayTooltip(string text){

diff --git a/Core/FormNotification.cs b/Core/FormNotification.cs
@@ -21,7 +21,6 @@ sealed partial class FormNotification : Form{
 
         private readonly Form owner;
         private readonly PluginManager plugins;
-        private readonly TrayIcon trayIcon;
         private readonly ChromiumWebBrowser browser;
 
         private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
@@ -81,14 +80,13 @@ sealed partial class FormNotification : Form{
             }
         }
 
-        public FormNotification(FormBrowser owner, PluginManager pluginManager, TrayIcon trayIcon, bool autoHide){
+        public FormNotification(FormBrowser owner, PluginManager pluginManager, bool autoHide){
             InitializeComponent();
 
             Text = Program.BrandName;
 
             this.owner = owner;
             this.plugins = pluginManager;
-            this.trayIcon = trayIcon;
             this.autoHide = autoHide;
 
             owner.FormClosed += (sender, args) => Close();
@@ -156,12 +154,8 @@ sealed partial class FormNotification : Form{
             if (Program.UserConfig.MuteNotifications){
                 HideNotification(true);
             }
-            else{
-                if (tweetQueue.Count > 0){
-                    LoadNextNotification();
-                }
-
-                trayIcon.HasNotifications = false;
+            else if (tweetQueue.Count > 0){
+                LoadNextNotification();
             }
         }
 
@@ -213,7 +207,6 @@ sealed partial class FormNotification : Form{
         public void ShowNotification(TweetNotification notification){
             if (Program.UserConfig.MuteNotifications){
                 tweetQueue.Enqueue(notification);
-                trayIcon.HasNotifications = true;
             }
             else{
                 tweetQueue.Enqueue(notification);

diff --git a/Core/Handling/TweetDeckBridge.cs b/Core/Handling/TweetDeckBridge.cs
@@ -83,12 +83,13 @@ class TweetDeckBridge{
 
         public void OnTweetPopup(string tweetHtml, string tweetUrl, int tweetCharacters){
             notification.InvokeSafe(() => {
+                form.OnTweetNotification();
                 notification.ShowNotification(new TweetNotification(tweetHtml,tweetUrl,tweetCharacters));
             });
         }
 
         public void OnTweetSound(){
-            form.InvokeSafe(form.OnTweetSound);
+            form.InvokeSafe(form.OnTweetNotification);
         }
 
         public void OnNotificationReady(){

diff --git a/Core/Other/Settings/TabSettingsGeneral.Designer.cs b/Core/Other/Settings/TabSettingsGeneral.Designer.cs
diff --git a/Core/Other/Settings/TabSettingsGeneral.cs b/Core/Other/Settings/TabSettingsGeneral.cs
@@ -13,6 +13,7 @@ partial class TabSettingsGeneral : BaseTabSettings{
             comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior,0),comboBoxTrayType.Items.Count-1);
 
             checkExpandLinks.Checked = Program.UserConfig.ExpandLinksOnHover;
+            checkTrayHighlight.Checked = Program.UserConfig.EnableTrayHighlight;
         }
 
         private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
@@ -26,5 +27,11 @@ partial class TabSettingsGeneral : BaseTabSettings{
 
             Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
         }
+
+        private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
+            if (!Ready)return;
+
+            Config.EnableTrayHighlight = checkTrayHighlight.Checked;
+        }
     }
 }