fix(FlyleafBar): stop disabling Activity when settings opened

Because the settings dialog is a stand-alone window, there is no need to disable Activity.

[etc]
- Fixed a problem with the FlyleafBar not being displayed when clicking buttons on consecutive

Author: umlx5h

LLPlayer/Controls/FlyleafBar.xaml

@@ -222,7 +222,7 @@ Right Click: Open Context Menu</ToolTip>
                             <MouseBinding Command="{Binding FL.Player.Commands.OpenFromFileDialog}" MouseAction="LeftClick" />
                         </TextBlock.InputBindings>
                         <TextBlock.ContextMenu>
-                            <ContextMenu Style="{StaticResource FlyleafContextMenu}" Opened="OnContextMenuOnOpened" Closed="OnContextMenuOnClosed">
+                            <ContextMenu Style="{StaticResource FlyleafContextMenu}" Opened="OnContextMenuOnOpened" Closed="OnContextMenuOnClosed" MouseMove="OnContextMenuOnMouseMove">
                                 <MenuItem Header="Open next" Command="{Binding FL.Action.CmdOpenNextFile}" />
                                 <MenuItem Header="Open prev" Command="{Binding FL.Action.CmdOpenPrevFile}" />
                                 <MenuItem Header="Open path" Command="{Binding FL.Action.CmdOpenCurrentPath}" />

LLPlayer/Controls/FlyleafBar.xaml.cs

@@ -30,6 +30,21 @@ public FlyleafBar()
         LostFocus += OnMouseLeave;
         MouseLeave += OnMouseLeave;
 
+        FL.Config.PropertyChanged += (sender, args) =>
+        {
+            if (args.PropertyName == nameof(FL.Config.SeekBarShowOnlyMouseOver))
+            {
+                // Avoided a problem in which Opacity was set to 0 when switching settings and was not displayed.
+                FL.Player.Activity.ForceFullActive();
+                IsShowing = true;
+
+                if (FL.Config.SeekBarShowOnlyMouseOver && !MyCard.IsMouseOver)
+                {
+                    IsShowing = false;
+                }
+            }
+        };
+
         FL.Player.Activity.PropertyChanged += (sender, args) =>
         {
             switch (args.PropertyName)
@@ -97,10 +112,9 @@ public bool IsShowing
 
     private void OnMouseLeave(object sender, RoutedEventArgs e)
     {
-        if (FL.Config.SeekBarShowOnlyMouseOver)
+        if (FL.Config.SeekBarShowOnlyMouseOver && FL.Player.Activity.IsEnabled)
         {
-            if (FL.Player.Activity.IsEnabled)
-                IsShowing = false;
+            IsShowing = false;
         }
         else
         {
@@ -110,10 +124,9 @@ private void OnMouseLeave(object sender, RoutedEventArgs e)
 
     private void OnMouseEnter(object sender, MouseEventArgs e)
     {
-        if (FL.Config.SeekBarShowOnlyMouseOver)
+        if (FL.Config.SeekBarShowOnlyMouseOver && FL.Player.Activity.IsEnabled)
         {
-            if (FL.Player.Activity.IsEnabled)
-                IsShowing = true;
+            IsShowing = true;
         }
         else
         {
@@ -144,13 +157,12 @@ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
             // Do not hide seek bar when context menu is displayed (register once)
             btn.ContextMenu.Opened += OnContextMenuOnOpened;
             btn.ContextMenu.Closed += OnContextMenuOnClosed;
+            btn.ContextMenu.MouseMove += OnContextMenuOnMouseMove;
             btn.ContextMenu.PlacementTarget = btn;
         }
         btn.ContextMenu.IsOpen = true;
     }
 
-    // TODO: L: Addresses the problem of disappearing after consecutive clicks
-    // of the SeekBar button when SeekBarShowOnlyMouseOver = true.
     private void OnContextMenuOnOpened(object o, RoutedEventArgs args)
     {
         SetActivity(false);
@@ -160,6 +172,12 @@ private void OnContextMenuOnClosed(object o, RoutedEventArgs args)
     {
         SetActivity(true);
     }
+
+    private void OnContextMenuOnMouseMove(object o, MouseEventArgs args)
+    {
+        // this is necessary to keep PopupMenu visible when opened in succession when SeekBarShowOnlyMouseOver
+        SetActivity(false);
+    }
 }
 
 public class SliderToolTipBehavior : Behavior<Slider>

LLPlayer/Resources/PopupMenu.xaml.cs

@@ -11,8 +11,6 @@ public PopupMenu()
         InitializeComponent();
     }
 
-    private bool _prevActivityEnabled;
-
     private void PopUpMenu_OnOpened(object sender, RoutedEventArgs e)
     {
         // TODO: L: should validate that the clipboard content is a video file?
@@ -22,10 +20,6 @@ private void PopUpMenu_OnOpened(object sender, RoutedEventArgs e)
         // Don't hide the seek bar while displaying the context menu
         if (sender is ContextMenu menu && menu.DataContext is FlyleafOverlayVM vm)
         {
-            if (!_prevActivityEnabled)
-            {
-                _prevActivityEnabled = vm.FL.Player.Activity.IsEnabled;
-            }
             vm.FL.Player.Activity.IsEnabled = false;
         }
     }
@@ -34,11 +28,7 @@ private void PopUpMenu_OnClosed(object sender, RoutedEventArgs e)
     {
         if (sender is ContextMenu menu && menu.DataContext is FlyleafOverlayVM vm)
         {
-            if (_prevActivityEnabled)
-            {
-                vm.FL.Player.Activity.IsEnabled = true;
-            }
-            _prevActivityEnabled = false;
+            vm.FL.Player.Activity.IsEnabled = true;
         }
     }
 }

LLPlayer/Services/AppActions.cs

@@ -364,17 +364,11 @@ private void SubsTextCopyInternal(int subIndex, bool? suppressOsd)
 
     public DelegateCommand CmdOpenWindowSettings => field ?? new(() =>
     {
-        // Keep the seek bar visible at all times while the settings screen is open.
-        int prevTimeout = _player.Activity.Timeout;
-
         if (_player.IsPlaying)
         {
             _player.Pause();
         }
 
-        _player.Activity.IsEnabled = false;
-        _player.Activity.Timeout = 0;
-
         // Detects configuration changes necessary for restart
         // TODO: L: refactor
         bool requiredRestart = false;
@@ -395,6 +389,7 @@ void ConfigOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
             }
         }
 
+        _player.Activity.ForceFullActive();
         _dialogService.ShowSingleton(nameof(SettingsDialog), result =>
         {
             // Activate as it may be minimized for some reason
@@ -426,15 +421,6 @@ void ConfigOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
                     }
                 }
             }
-
-            // Closing the app while settings is open may cause it to be null.
-            if (_player.Activity.Timeout == 0)
-            {
-                _player.Activity.Timeout = prevTimeout;
-            }
-
-            _player.Activity.IsEnabled = true;
-
         }, false);
     });
 

LLPlayer/ViewModels/FlyleafOverlayVM.cs

@@ -176,16 +176,16 @@ private void SurfaceOnMouseMove(object sender, MouseEventArgs e)
 
     private void DragMoveOwner()
     {
-        bool prevEnabled = FL.Player.Activity.IsEnabled;
-        // prevent to activate seek bar when mouse over
+        // (!SeekBarShowOnlyMouseOver) always show cursor when moving
+        // (SeekBarShowOnlyMouseOver)  prevent to activate seek bar
         if (!FL.Config.SeekBarShowOnlyMouseOver)
         {
             FL.Player.Activity.IsEnabled = false;
         }
 
         FL.FlyleafHost!.Owner.DragMove();
 
-        if (!FL.Config.SeekBarShowOnlyMouseOver && prevEnabled)
+        if (!FL.Config.SeekBarShowOnlyMouseOver)
         {
             FL.Player.Activity.IsEnabled = true;
         }