Merge pull request #556 from unchihugo/refactor/simplify-settings-options

Simplified Taskbar Widget settings page by removing the Clickable and Closeable options and setting them to be always true as most users will leave these on by default.

Removed (Experimental) label from Next Up settings page as this feature has been extensively tested and matured.

Changed Taskbar Widget settings page InfoBar severity level to be informational instead of warning.

Author: unchihugo

FluentFlyoutWPF/Controls/TaskbarWidgetControl.xaml.cs

@@ -103,7 +103,7 @@ public void ApplyWindowsTheme()
 
     private void Grid_MouseEnter(object sender, MouseEventArgs e)
     {
-        if (!SettingsManager.Current.TaskbarWidgetClickable || String.IsNullOrEmpty(SongTitle.Text + SongArtist.Text)) return;
+        if (string.IsNullOrEmpty(SongTitle.Text + SongArtist.Text)) return;
 
         SolidColorBrush targetBackgroundBrush;
         // hover effects with animations, hard-coded colors because I can't find the resource brushes
@@ -146,7 +146,7 @@ private void Grid_MouseEnter(object sender, MouseEventArgs e)
 
     private void Grid_MouseLeave(object sender, MouseEventArgs e)
     {
-        if (!SettingsManager.Current.TaskbarWidgetClickable || String.IsNullOrEmpty(SongTitle.Text + SongArtist.Text)) return;
+        if (string.IsNullOrEmpty(SongTitle.Text + SongArtist.Text)) return;
 
         // Animate back to transparent
         var backgroundAnimation = new ColorAnimation
@@ -171,10 +171,10 @@ private void Grid_MouseLeave(object sender, MouseEventArgs e)
 
     private void Grid_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
     {
-        if (!SettingsManager.Current.TaskbarWidgetClickable || _mainWindow == null) return;
+        if (_mainWindow == null) return;
 
-        // toggle main flyout when clicked if toggle mode is enabled, otherwise just open
-        _mainWindow.ShowMediaFlyout(toggleMode: SettingsManager.Current.TaskbarWidgetCloseableFlyout, forceShow: true);
+        // toggle main flyout when clicked
+        _mainWindow.ShowMediaFlyout(toggleMode: true, forceShow: true);
     }
 
     public (double logicalWidth, double logicalHeight) CalculateSize(double dpiScale)
@@ -288,13 +288,13 @@ public void UpdateUi(string title, string artist, BitmapImage? icon, GlobalSyste
                 }
             }
 
-            SongTitle.Text = !String.IsNullOrEmpty(title) ? title : "-";
-            SongArtist.Text = !String.IsNullOrEmpty(artist) ? artist : "-";
+            SongTitle.Text = !string.IsNullOrEmpty(title) ? title : "-";
+            SongArtist.Text = !string.IsNullOrEmpty(artist) ? artist : "-";
 
             // Update tooltip with song info
             SongInfoStackPanel.ToolTip = string.Empty;
-            SongInfoStackPanel.ToolTip += !String.IsNullOrEmpty(title) ? title : string.Empty;
-            SongInfoStackPanel.ToolTip += !String.IsNullOrEmpty(artist) ? "\n\n" + artist : string.Empty;
+            SongInfoStackPanel.ToolTip += !string.IsNullOrEmpty(title) ? title : string.Empty;
+            SongInfoStackPanel.ToolTip += !string.IsNullOrEmpty(artist) ? "\n\n" + artist : string.Empty;
 
             if (SettingsManager.Current.TaskbarWidgetControlsEnabled)
             {
@@ -333,7 +333,7 @@ public void UpdateUi(string title, string artist, BitmapImage? icon, GlobalSyste
             }
 
             SongTitle.Visibility = Visibility.Visible;
-            SongArtist.Visibility = !String.IsNullOrEmpty(artist) ? Visibility.Visible : Visibility.Collapsed; // hide artist if it's not available
+            SongArtist.Visibility = !string.IsNullOrEmpty(artist) ? Visibility.Visible : Visibility.Collapsed; // hide artist if it's not available
             SongInfoStackPanel.Visibility = Visibility.Visible;
             BackgroundImage.Visibility = SettingsManager.Current.TaskbarWidgetBackgroundBlur ? Visibility.Visible : Visibility.Collapsed;
 

FluentFlyoutWPF/Pages/TaskbarWidgetPage.xaml

@@ -110,7 +110,7 @@
                 </ui:CardControl.Header>
                 <controls:ToggleSwitch IsChecked="{Binding TaskbarWidgetEnabled, Mode=TwoWay}" IsEnabled="{Binding IsPremiumUnlocked}" />
             </ui:CardControl>
-            <ui:InfoBar Grid.Row="3" Title="{DynamicResource TaskbarWidgetVisualIssuesWarning}" IsOpen="True" Severity="Warning" IsClosable="False" Margin="0,0,0,3" />
+            <ui:InfoBar Grid.Row="3" Title="{DynamicResource TaskbarWidgetVisualIssuesWarning}" IsOpen="True" Severity="Informational" IsClosable="False" Margin="0,0,0,3" />
 
             <ui:CardControl Grid.Row="4" Icon="{ui:SymbolIcon ArrowMove24}" Margin="0,0,0,3">
                 <ui:CardControl.Header>
@@ -189,27 +189,6 @@
                 </StackPanel>
             </ui:CardExpander>
 
-            <ui:CardControl Grid.Row="7" Icon="{ui:SymbolIcon ExpandUpRight24}" Margin="0,0,0,3">
-                <ui:CardControl.Header>
-                    <StackPanel Orientation="Vertical">
-                        <TextBlock Text="{DynamicResource TaskbarWidgetClickableTitle}" FontSize="14" FontWeight="Regular" VerticalAlignment="Center" />
-                        <TextBlock Text="{DynamicResource TaskbarWidgetClickableDescription}" FontSize="12" Opacity="0.5" />
-                    </StackPanel>
-                </ui:CardControl.Header>
-                <controls:ToggleSwitch IsChecked="{Binding TaskbarWidgetClickable, Mode=TwoWay}" IsEnabled="{Binding IsPremiumUnlocked}" />
-            </ui:CardControl>
-            <ui:CardControl Grid.Row="8" Icon="{ui:SymbolIcon ArrowSwap24}" Margin="0,0,0,12">
-                <ui:CardControl.Header>
-                    <StackPanel Orientation="Vertical">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{DynamicResource TaskbarWidgetCloseableFlyoutTitle}" FontSize="14" FontWeight="Regular" VerticalAlignment="Center" />
-                            <ui:InfoBadge Value=" NEW " FontWeight="Medium" FontSize="10" Margin="6,-2,0,-2" Severity="Success" />
-                        </StackPanel>
-                        <TextBlock Text="{DynamicResource TaskbarWidgetCloseableFlyoutDescription}" FontSize="12" Opacity="0.5" />
-                    </StackPanel>
-                </ui:CardControl.Header>
-                <controls:ToggleSwitch Name="TaskbarWidgetCloseableFlyoutSwitch" IsChecked="{Binding TaskbarWidgetCloseableFlyout, Mode=TwoWay}" IsEnabled="{Binding IsPremiumUnlocked}" />
-            </ui:CardControl>
             <ui:CardControl Grid.Row="9" Icon="{ui:SymbolIcon ColorBackground24}" Margin="0,0,0,3">
                 <ui:CardControl.Header>
                     <StackPanel Orientation="Vertical">

FluentFlyoutWPF/Resources/Localization/Dictionary-en-US.xaml

@@ -9,8 +9,6 @@
     <System:String x:Key="TextBlockText3">Display a flyout when you press a media key</System:String>
     <System:String x:Key="MediaFlyoutExcludeVolumeTitle">Exclude Volume Keys</System:String>
     <System:String x:Key="MediaFlyoutExcludeVolumeDescription">Do not display the flyout when pressing volume up/down/mute</System:String>
-    <System:String x:Key="TaskbarWidgetCloseableFlyoutTitle">Close Flyout on Second Click</System:String>
-    <System:String x:Key="TaskbarWidgetCloseableFlyoutDescription">Close the flyout if it's already open when clicking the taskbar widget</System:String>
     <System:String x:Key="TextBlockText2">Choose from a preset of modern background blur styles</System:String>
     <System:String x:Key="BackgroundBlurOption1" xml:space="preserve"> None</System:String>
     <System:String x:Key="BackgroundBlurOption2" xml:space="preserve"> Style 1 (Cover Glow)</System:String>
@@ -60,8 +58,6 @@ hides repeat, shuffle and player info</System:String>
     <System:String x:Key="TaskbarWidgetPaddingDescription">Turn this feature on if you have Windows Widgets enabled</System:String>
     <System:String x:Key="TaskbarWidgetManualPaddingTitle">Custom Padding</System:String>
     <System:String x:Key="TaskbarWidgetManualPaddingDescription">Add extra padding (default: 0px)</System:String>
-    <System:String x:Key="TaskbarWidgetClickableTitle">Click to open Media Flyout when media is Present</System:String>
-    <System:String x:Key="TaskbarWidgetClickableDescription">Clicking the taskbar widget will open the media flyout</System:String>
     <System:String x:Key="TaskbarWidgetBackgroundBlurTitle">Background Blur</System:String>
     <System:String x:Key="TaskbarWidgetBackgroundBlurDescription">Add background blur effect to the taskbar widget</System:String>
     <System:String x:Key="TaskbarWidgetHideCompletelyTitle">Hide Completely When No Media Is Present</System:String>
@@ -111,7 +107,7 @@ Note: As an open-source project, these features are also available for free via
     <System:String x:Key="AllFuturePremiumFeatures">All future Premium features</System:String>
     <System:String x:Key="NextUpCustomizationTitle">Next Up Flyout</System:String>
     <System:String x:Key="NextUpDescription" xml:space="preserve">A flyout shows what's next when a song/video ends. Only appears if the next item plays automatically, if next/previous is pressed manually, the main flyout appears instead.</System:String>
-    <System:String x:Key="EnableNextUpTitle">Enable Next Up Flyout (Experimental)</System:String>
+    <System:String x:Key="EnableNextUpTitle">Enable Next Up Flyout</System:String>
     <System:String x:Key="EnableNextUpDescription">Shows what's next when a song/video ends</System:String>
     <System:String x:Key="NextUpStayDurationTitle">Next Up Stay Duration</System:String>
     <System:String x:Key="NextUpStayDurationDescription">(default: 2000 ms)</System:String>

FluentFlyoutWPF/ViewModels/UserSettings.cs

@@ -378,18 +378,6 @@ public string TaskbarWidgetManualPaddingText
         }
     }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the taskbar widget is clickable
-    /// </summary>
-    [ObservableProperty]
-    public partial bool TaskbarWidgetClickable { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether clicking the taskbar widget toggles the flyout (close if already open)
-    /// </summary>
-    [ObservableProperty]
-    public partial bool TaskbarWidgetCloseableFlyout { get; set; }
-
     /// <summary>
     /// Gets or sets a value indication whether the taskbar widget background should have a blur effect
     /// </summary>
@@ -572,8 +560,6 @@ public UserSettings()
         TaskbarWidgetPosition = 0;
         TaskbarWidgetPadding = true;
         TaskbarWidgetManualPadding = 0;
-        TaskbarWidgetClickable = true;
-        TaskbarWidgetCloseableFlyout = true;
         TaskbarWidgetBackgroundBlur = false;
         TaskbarWidgetHideCompletely = false;
         TaskbarWidgetControlsEnabled = false;
@@ -664,12 +650,6 @@ partial void OnTaskbarWidgetManualPaddingChanged(int oldValue, int newValue)
         UpdateTaskbar();
     }
 
-    partial void OnTaskbarWidgetClickableChanged(bool oldValue, bool newValue)
-    {
-        if (oldValue == newValue || _initializing) return;
-        UpdateTaskbar();
-    }
-
     partial void OnTaskbarWidgetBackgroundBlurChanged(bool oldValue, bool newValue)
     {
         if (oldValue == newValue || _initializing) return;