Merge pull request #637 from dremin/invert-icon-mode

Add settings to control icon invert
dremin · Jul 25, 2023 · ce53546 · ce53546
2 parents a53bbb5 + 9e6b4b9
commit ce53546
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,8 @@ RetroBar is based on the [ManagedShell](https://github.com/cairoshell/ManagedShe
 - Quick launch toolbar
 - Start button opens modern start menu
 - Ability to show or hide the clock
+- Ability to auto-hide the taskbar
+- Locked and unlocked taskbar appearances
 - Display taskbar on any side of the screen (even on Windows 11)
 - Option to display the taskbar, notification area, and clock on multiple monitors
 - Ability to show Vista-style window thumbnails
@@ -74,6 +76,7 @@ RetroBar is based on the [ManagedShell](https://github.com/cairoshell/ManagedShe
 - Russian (русский)
 - Serbian (Cyrillic) (српски)
 - Serbian (Latin) (srpski)
+- Slovak (slovenčina)
 - Spanish (español)
 - Swedish (svenska)
 - Turkish (Türkçe)

diff --git a/RetroBar/App.config b/RetroBar/App.config
@@ -73,6 +73,9 @@
             <setting name="LockTaskbar" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="InvertIconsMode" serializeAs="String">
+                <value>0</value>
+            </setting>
         </RetroBar.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/RetroBar/Controls/NotifyIcon.xaml.cs b/RetroBar/Controls/NotifyIcon.xaml.cs
@@ -33,7 +33,7 @@ public NotifyIcon()
 
         private void applyEffects()
         {
-            if (!EnvironmentHelper.IsWindows10OrBetter || TrayIcon == null)
+            if ((!EnvironmentHelper.IsWindows10OrBetter && Settings.Instance.InvertIconsMode == 0) || TrayIcon == null || Settings.Instance.InvertIconsMode == 2)
             {
                 return;
             }
@@ -53,13 +53,14 @@ private void applyEffects()
             }
 
             bool invertByTheme = Application.Current.FindResource("InvertSystemNotifyIcons") as bool? ?? false;
+            bool performInvert = invertByTheme || Settings.Instance.InvertIconsMode == 1;
 
-            if (NotifyIconImage.Effect == null != invertByTheme)
+            if (NotifyIconImage.Effect == null != performInvert)
             {
                 return;
             }
 
-            if (invertByTheme)
+            if (performInvert)
             {
                 NotifyIconImage.Effect = new InvertEffect();
             }

diff --git a/RetroBar/Controls/NotifyIconList.xaml.cs b/RetroBar/Controls/NotifyIconList.xaml.cs
@@ -51,6 +51,20 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     NotifyIcons.ItemsSource = allNotifyIconsSource.View;
                 }
             }
+            else if (e.PropertyName == "InvertIconsMode")
+            {
+                // Reload icons
+                NotifyIcons.ItemsSource = null;
+
+                if (Settings.Instance.CollapseNotifyIcons)
+                {
+                    NotifyIcons.ItemsSource = pinnedNotifyIconsSource.View;
+                }
+                else
+                {
+                    NotifyIcons.ItemsSource = allNotifyIconsSource.View;
+                }
+            }
         }
 
         private void NotifyIconList_OnLoaded(object sender, RoutedEventArgs e)

diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
@@ -41,6 +41,12 @@
         <s:String>Same taskbar as window</s:String>
         <s:String>Same taskbar as window and primary taskbar</s:String>
     </x:Array>
+    <s:String x:Key="invert_system_icons">_Invert system icons:</s:String>
+    <x:Array x:Key="invert_system_icons_values" Type="s:String">
+        <s:String>When needed by theme</s:String>
+        <s:String>Always</s:String>
+        <s:String>Never</s:String>
+    </x:Array>
     <s:String x:Key="version">Version {0}</s:String>
     <s:String x:Key="visit_on_github">Visit RetroBar on GitHub</s:String>
     <s:String x:Key="taskbar_scale">Taskbar scale</s:String>

diff --git a/RetroBar/Properties/Settings.Designer.cs b/RetroBar/Properties/Settings.Designer.cs
diff --git a/RetroBar/Properties/Settings.settings b/RetroBar/Properties/Settings.settings
@@ -68,5 +68,8 @@
     <Setting Name="LockTaskbar" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="InvertIconsMode" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
@@ -312,6 +312,16 @@
                                   IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=DebugLogging, UpdateSourceTrigger=PropertyChanged}">
                             <Label Content="{DynamicResource debug_logging}" />
                         </CheckBox>
+                        <DockPanel>
+                            <Label VerticalAlignment="Center"
+                                   Target="{Binding ElementName=cboInvertIconsMode}">
+                                <AccessText Text="{DynamicResource invert_system_icons}" />
+                            </Label>
+                            <ComboBox Name="cboInvertIconsMode"
+                                      ItemsSource="{DynamicResource invert_system_icons_values}"
+                                      SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=InvertIconsMode, UpdateSourceTrigger=PropertyChanged}"
+                                      SelectionChanged="cboInvertIconsMode_SelectionChanged" />
+                        </DockPanel>
                     </StackPanel>
                     <GroupBox Header="{DynamicResource multiple_displays}"
                               Margin="0,0,0,10">

diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
@@ -219,6 +219,14 @@ private void cboMultiMonMode_SelectionChanged(object sender, System.Windows.Cont
             }
         }
 
+        private void cboInvertIconsMode_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            if (cboInvertIconsMode.SelectedItem == null)
+            {
+                cboInvertIconsMode.SelectedValue = cboInvertIconsMode.Items[Settings.Instance.InvertIconsMode];
+            }
+        }
+
         private void CustomizeNotifications_OnClick(object sender, RoutedEventArgs e)
         {
             OpenCustomizeNotifications();

diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
@@ -288,6 +288,12 @@ public bool MiddleMouseToClose
             }
         }
 
+        /// <summary>
+        /// 0 = Left
+        /// 1 = Top
+        /// 2 = Right
+        /// 3 = Bottom
+        /// </summary>
         public int Edge
         {
             get
@@ -348,6 +354,11 @@ public bool ShowTaskThumbnails
             }
         }
 
+        /// <summary>
+        /// 0 = All taskbars
+        /// 1 = Same taskbar as window
+        /// 2 = Same taskbar as window and primary taskbar
+        /// </summary>
         public int MultiMonMode
         {
             get
@@ -427,6 +438,31 @@ public bool LockTaskbar
                 }
             }
         }
+
+        /// <summary>
+        /// 0 = When needed by theme
+        /// 1 = Always
+        /// 2 = Never
+        /// </summary>
+        public int InvertIconsMode
+        {
+            get
+            {
+                if (settings.InvertIconsMode >= 0 && settings.InvertIconsMode <= 2)
+                {
+                    return settings.InvertIconsMode;
+                }
+
+                return 0;
+            }
+            set
+            {
+                if (settings.InvertIconsMode != value && value >= 0 && value <= 2)
+                {
+                    settings.InvertIconsMode = value;
+                }
+            }
+        }
         #endregion
 
         #region Helpers