Merge pull request #37 from dremin/font-option

Options for run at logon and font smoothing
dremin · Jul 11, 2021 · 96b7e99 · 96b7e99
2 parents 991b476 + bab40bd
commit 96b7e99
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 63 deletions.
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
@@ -20,5 +20,8 @@
     <Setting Name="CollapseNotifyIcons" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="AllowFontSmoothing" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
@@ -4,11 +4,13 @@
         xmlns:Settings="clr-namespace:RetroBar.Utilities"
         xmlns:converters="clr-namespace:RetroBar.Converters"
         Title="RetroBar Properties"
-        Height="400"
-        Width="345"
+        Height="Auto"
+        Width="Auto"
         ResizeMode="NoResize"
+        SizeToContent="WidthAndHeight"
         Style="{DynamicResource PropertiesWindow}"
-        Closing="PropertiesWindow_OnClosing">
+        Closing="PropertiesWindow_OnClosing"
+        Loaded="PropertiesWindow_OnLoaded">
     <Window.Resources>
         <ResourceDictionary>
             <converters:PropertiesImageSourceConverter x:Key="imageConverter" />
@@ -62,50 +64,51 @@
         </Grid.RowDefinitions>
         <TabControl Grid.Row="0">
             <TabItem Header="Taskbar Options">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Orientation="Vertical"
-                                Grid.Column="1">
-                        <Image Width="274"
-                               Height="130"
-                               Margin="0,20">
-                            <Image.Source>
-                                <MultiBinding Converter="{StaticResource imageConverter}" 
-                                              NotifyOnSourceUpdated="True">
-                                    <Binding RelativeSource="{RelativeSource Self}" />
-                                    <Binding Source="{x:Static Settings:Settings.Instance}"
-                                             Path="ShowClock"
-                                             UpdateSourceTrigger="PropertyChanged" />
-                                </MultiBinding>
-                            </Image.Source>
-                        </Image>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="Theme:"
-                                       ToolTip="Install themes in the Themes folder." />
-                            <ComboBox Name="cboThemeSelect"
-                                      IsDropDownOpen="False"
-                                      IsEditable="False"
-                                      SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=Theme, UpdateSourceTrigger=PropertyChanged}" />
-                        </StackPanel>
-                        <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowClock, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="Show clock" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=CollapseNotifyIcons, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="Collapse notification area icons" />
+                <StackPanel Orientation="Vertical"
+                            Margin="20">
+                    <Image Width="274"
+                           Height="130"
+                           Margin="0,0,0,10">
+                        <Image.Source>
+                            <MultiBinding Converter="{StaticResource imageConverter}"
+                                          NotifyOnSourceUpdated="True">
+                                <Binding RelativeSource="{RelativeSource Self}" />
+                                <Binding Source="{x:Static Settings:Settings.Instance}"
+                                         Path="ShowClock"
+                                         UpdateSourceTrigger="PropertyChanged" />
+                            </MultiBinding>
+                        </Image.Source>
+                    </Image>
+                    <CheckBox Checked="AutoStartCheckBox_OnChecked"
+                              Unchecked="AutoStartCheckBox_OnChecked"
+                              Name="AutoStartCheckBox">
+                        <Label Content="Automatically start at logon" />
+                    </CheckBox>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="Theme:"
+                                   ToolTip="Install themes in the Themes folder." />
+                        <ComboBox Name="cboThemeSelect"
+                                  IsDropDownOpen="False"
+                                  IsEditable="False"
+                                  SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=Theme, UpdateSourceTrigger=PropertyChanged}" />
+                    </StackPanel>
+                    <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=AllowFontSmoothing, UpdateSourceTrigger=PropertyChanged}">
+                        <Label Content="Allow font smoothing" />
+                    </CheckBox>
+                    <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=CollapseNotifyIcons, UpdateSourceTrigger=PropertyChanged}">
+                        <Label Content="Collapse notification area icons" />
+                    </CheckBox>
+                    <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowClock, UpdateSourceTrigger=PropertyChanged}">
+                        <Label Content="Show clock" />
+                    </CheckBox>
+                    <StackPanel Orientation="Horizontal">
+                        <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunch, UpdateSourceTrigger=PropertyChanged}">
+                            <Label Content="Show quick launch" />
                         </CheckBox>
-                        <StackPanel Orientation="Horizontal">
-                            <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunch, UpdateSourceTrigger=PropertyChanged}">
-                                <Label Content="Show quick launch" />
-                            </CheckBox>
-                            <Button Content="Select location..."
-                                    Click="SetQuickLaunchLocation_OnClick" />
-                        </StackPanel>
+                        <Button Content="Select location..."
+                                Click="SetQuickLaunchLocation_OnClick" />
                     </StackPanel>
-                </Grid>
+                </StackPanel>
             </TabItem>
         </TabControl>
         <StackPanel Orientation="Horizontal"
@@ -116,4 +119,4 @@
                     Click="OK_OnClick" />
         </StackPanel>
     </Grid>
-</Window>
+</Window>
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
@@ -1,7 +1,13 @@
-using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 using ManagedShell.Common.Helpers;
 using RetroBar.Utilities;
 using System.Windows;
+using System.Windows.Controls;
+using ManagedShell.Common.Logging;
+using Microsoft.Win32;
 
 namespace RetroBar
 {
@@ -20,10 +26,8 @@ private PropertiesWindow(ThemeManager themeManager)
 
             InitializeComponent();
 
+            LoadAutoStart();
             LoadThemes();
-
-            Left = 10;
-            Top = (ScreenHelper.PrimaryMonitorDeviceSize.Height / DpiHelper.DpiScale) - Height - 40;
         }
 
         public static void Open(ThemeManager themeManager)
@@ -39,6 +43,31 @@ public static void Open(ThemeManager themeManager)
             }
         }
 
+        private void LoadAutoStart()
+        {
+            try
+            {
+                RegistryKey rKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Run", false);
+                List<string> rKeyValueNames = rKey?.GetValueNames().ToList();
+
+                if (rKeyValueNames != null)
+                {
+                    if (rKeyValueNames.Contains("RetroBar"))
+                    {
+                        AutoStartCheckBox.IsChecked = true;
+                    }
+                    else
+                    {
+                        AutoStartCheckBox.IsChecked = false;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                ShellLogger.Error($"PropertiesWindow: Unable to load autorun setting from registry: {e.Message}");
+            }
+        }
+
         private void LoadThemes()
         {
             foreach (var theme in _themeManager.GetThemes())
@@ -70,5 +99,34 @@ private void PropertiesWindow_OnClosing(object sender, CancelEventArgs e)
         {
             _instance = null;
         }
+
+        private void PropertiesWindow_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            Left = 10;
+            Top = (ScreenHelper.PrimaryMonitorDeviceSize.Height / DpiHelper.DpiScale) - Height - 40;
+        }
+
+        private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                RegistryKey rKey = Registry.CurrentUser.CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Run");
+                var chkBox = (CheckBox)sender;
+
+                if (chkBox.IsChecked.Equals(false))
+                {
+                    rKey?.DeleteValue("RetroBar");
+                }
+                else
+                {
+                    string exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+                    rKey?.SetValue("RetroBar", exePath);
+                }
+            }
+            catch (Exception exception)
+            {
+                ShellLogger.Error($"PropertiesWindow: Unable to update registry autorun setting: {exception.Message}");
+            }
+        }
     }
 }
diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
@@ -7,6 +7,7 @@
 using System;
 using System.ComponentModel;
 using System.Windows;
+using System.Windows.Media;
 using ManagedShell.ShellFolders;
 using RetroBar.Utilities;
 using Application = System.Windows.Application;
@@ -32,6 +33,7 @@ public Taskbar(ShellManager shellManager, CloakMonitor cloakMonitor, AppBarScree
             DataContext = _shellManager;
             DesiredHeight = Application.Current.FindResource("TaskbarHeight") as double? ?? 0;
             AllowsTransparency = Application.Current.FindResource("AllowsTransparency") as bool? ?? false;
+            SetFontSmoothing();
             SetupQuickLaunch();
 
             _explorerHelper.HideExplorerTaskbar = true;
@@ -83,6 +85,11 @@ public override void SetPosition()
                 }
             });
         }
+
+        private void SetFontSmoothing()
+        {
+            VisualTextRenderingMode = Settings.Instance.AllowFontSmoothing ? TextRenderingMode.Auto : TextRenderingMode.Aliased;
+        }
 
         private void SetupQuickLaunch()
         {
@@ -130,6 +137,10 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             {
                 SetupQuickLaunch();
             }
+            else if (e.PropertyName == "AllowFontSmoothing")
+            {
+                SetFontSmoothing();
+            }
         }
 
         private void Taskbar_OnLocationChanged(object? sender, EventArgs e)

diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
@@ -52,8 +52,6 @@
 
     <Style TargetType="Window"
            x:Key="Taskbar">
-        <Setter Property="TextOptions.TextRenderingMode"
-                Value="Aliased" />
         <Setter Property="TextOptions.TextFormattingMode"
                 Value="Display" />
         <Setter Property="Template">

diff --git a/RetroBar/Themes/Watercolor.xaml b/RetroBar/Themes/Watercolor.xaml
@@ -59,8 +59,6 @@
     <Style TargetType="Window"
            x:Key="Taskbar"
            BasedOn="{StaticResource Taskbar}">
-        <Setter Property="TextOptions.TextRenderingMode"
-                Value="Auto" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Window">

diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
@@ -222,8 +222,6 @@
     <Style TargetType="Window"
            x:Key="Taskbar"
            BasedOn="{StaticResource Taskbar}">
-        <Setter Property="TextOptions.TextRenderingMode"
-                Value="Auto" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Window">

diff --git a/RetroBar/Themes/Windows XP Classic.xaml b/RetroBar/Themes/Windows XP Classic.xaml
@@ -15,11 +15,4 @@
 
     <BitmapImage x:Key="StartIconImage"
                  UriSource="../Resources/startxpclassic.png"/>
-
-    <Style TargetType="Window"
-           x:Key="Taskbar"
-           BasedOn="{StaticResource Taskbar}">
-        <Setter Property="TextOptions.TextRenderingMode"
-                Value="Auto" />
-    </Style>
 </ResourceDictionary>
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
@@ -164,6 +164,21 @@ public bool CollapseNotifyIcons
                 }
             }
         }
+
+        public bool AllowFontSmoothing
+        {
+            get
+            {
+                return settings.AllowFontSmoothing;
+            }
+            set
+            {
+                if (settings.AllowFontSmoothing != value)
+                {
+                    settings.AllowFontSmoothing = value;
+                }
+            }
+        }
         #endregion
 
         public void Save()
@@ -176,6 +191,8 @@ public void Upgrade()
             _upgrading = true;
             settings.Upgrade();
             _upgrading = false;
+
+            if (IsFirstRun) IsFirstRun = false;
         }
 
         public object this[string propertyName]