Merge pull request #57 from grandixximo/cursor/fix-broken-overlay-tools-by-comparing-with-main-bcb4

partially fixed some overlay tools

Author: grandixximo

src/Captura.Core/Settings/Settings.cs

@@ -36,6 +36,15 @@ public Settings(FFmpegSettings FFmpeg, WindowsSettings WindowsSettings)
         {
             this.FFmpeg = FFmpeg;
             this.WindowsSettings = WindowsSettings;
+            
+            // Sync IncludeCursor with MousePointerOverlay.Display
+            MousePointerOverlay.PropertyChanged += (s, e) =>
+            {
+                if (e.PropertyName == nameof(MousePointerOverlay.Display))
+                {
+                    OnPropertyChanged(nameof(IncludeCursor));
+                }
+            };
         }
 
         static string GetPath() => Path.Combine(ServiceProvider.SettingsDir, "Captura.json");
@@ -231,8 +240,12 @@ public string GetFileName(string Extension, string FileName = null)
 
         public bool IncludeCursor
         {
-            get => Get(true);
-            set => Set(value);
+            get => MousePointerOverlay.Display;
+            set
+            {
+                MousePointerOverlay.Display = value;
+                OnPropertyChanged();
+            }
         }
 
         public bool RegionPickerHotkeyAutoStartRecording

src/Captura/Pages/KeystrokesPage.xaml

@@ -1,4 +1,4 @@
-<Page x:Class="Captura.KeystrokesPage"
+<Page x:Class="Captura.KeystrokesPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:captura="clr-namespace:Captura"
@@ -7,10 +7,14 @@
         <ScrollViewer DataContext="{Binding AboutViewModel, Source={StaticResource ServiceLocator}}">
             <StackPanel Margin="5"
                         DataContext="{Binding Settings.Keystrokes}">
+                <CheckBox Content="Display"
+                          IsChecked="{Binding Display, Mode=TwoWay}"
+                          Margin="0,5"/>
+
                 <CheckBox Content="{Binding KeystrokesSeparateFile, Source={StaticResource Loc}, Mode=OneWay}"
                           IsChecked="{Binding SeparateTextFile, Mode=TwoWay}"
                           Margin="0,3"
-                          IsEnabled="{Binding MainViewModel.RecordingViewModel.RecorderState, Source={StaticResource ServiceLocator}, Converter={StaticResource NotRecordingConverter}}"/>
+                          IsEnabled="{Binding ViewConditions.IsEnabled.Value, Source={StaticResource ServiceLocator}}"/>
 
                 <DockPanel Margin="0,3">
                     <Label Content="{Binding Keymap, Source={StaticResource Loc}, Mode=OneWay}"
@@ -78,6 +82,11 @@
                                         Grid.Column="1"
                                         Margin="0,5"/>
                 </Grid>
+
+                <CheckBox Content="Show Repeat Counter"
+                          IsChecked="{Binding ShowRepeatCounter, Mode=TwoWay}"
+                          Margin="0,3"
+                          Visibility="{Binding SeparateTextFile, Converter={StaticResource NegatingConverter}}"/>
             </StackPanel>
         </ScrollViewer>
     </Grid>

src/Captura/Pages/MouseOverlayPage.xaml

@@ -94,6 +94,10 @@
 
                 <StackPanel Margin="5"
                             DataContext="{Binding Settings.Clicks}">
+                    <CheckBox Content="Display Clicks"
+                              IsChecked="{Binding Display, Mode=TwoWay}"
+                              Margin="0,5"/>
+
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"/>
@@ -172,6 +176,51 @@
                                           Margin="0,5"/>
                     </Grid>
                 </StackPanel>
+
+                <Label Content="Mouse Scroll"
+                       FontWeight="DemiBold"
+                       Margin="5,10,5,0"/>
+                <Label Content="Horizontal scrolls aren't displayed correctly"
+                       FontWeight="Light"
+                       FontSize="9"
+                       Margin="5,0"/>
+
+                <StackPanel Margin="5"
+                            DataContext="{Binding Settings.Clicks}"
+                            IsEnabled="{Binding Display}">
+                    <CheckBox Content="Display Scroll"
+                              IsChecked="{Binding DisplayScroll, Mode=TwoWay}"
+                              Margin="0,5"/>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+
+                        <Label Content="Circle Color"
+                               ContentStringFormat="{}{0}: "
+                               Margin="0,5,5,5"/>
+                        <xctk:ColorPicker SelectedColor="{Binding ScrollCircleColor, Converter={StaticResource WpfColorConverter}, Mode=TwoWay}"
+                                          Grid.Row="0"
+                                          Grid.Column="1"
+                                          Margin="0,5"/>
+
+                        <Label Content="Arrow Color"
+                               ContentStringFormat="{}{0}: "
+                               Margin="0,5,5,5"
+                               Grid.Row="1"
+                               Grid.Column="0"/>
+                        <xctk:ColorPicker SelectedColor="{Binding ScrollArrowColor, Converter={StaticResource WpfColorConverter}, Mode=TwoWay}"
+                                          Grid.Row="1"
+                                          Grid.Column="1"
+                                          Margin="0,5"/>
+                    </Grid>
+                </StackPanel>
             </StackPanel>
         </ScrollViewer>
     </Grid>

src/Captura/Pages/OverlayPage.xaml.cs

@@ -22,7 +22,7 @@ namespace Captura
 {
     public partial class OverlayPage
     {
-        public OverlayPage()
+        OverlayPage()
         {
             InitializeComponent();
 
@@ -37,24 +37,15 @@ public OverlayPage()
 
         void AddToGrid(LayerFrame Frame, bool CanResize)
         {
-            if (Grid == null)
-                return;
-
             Grid.Children.Add(Frame);
 
             Panel.SetZIndex(Frame, 0);
 
-            // Wait for visual tree to be ready before accessing AdornerLayer
-            Frame.Loaded += (s, e) =>
-            {
-                var layer = AdornerLayer.GetAdornerLayer(Frame);
-                if (layer != null)
-                {
-                    var adorner = new OverlayPositionAdorner(Frame, CanResize);
-                    layer.Add(adorner);
-                    adorner.PositionUpdated += Frame.RaisePositionChanged;
-                }
-            };
+            var layer = AdornerLayer.GetAdornerLayer(Frame);
+            var adorner = new OverlayPositionAdorner(Frame, CanResize);
+            layer.Add(adorner);
+
+            adorner.PositionUpdated += Frame.RaisePositionChanged;
         }
 
         LayerFrame Generate(PositionedOverlaySettings Settings, string Text, Color BackgroundColor)
@@ -387,9 +378,6 @@ bool IsOutsideGrid(Point Point)
 
         void UIElement_OnMouseMove(object Sender, MouseEventArgs E)
         {
-            if (ServiceProvider.Get<Settings>().MousePointerOverlay.DisplayHighlight)
-                MousePointer.Visibility = Visibility.Visible;
-
             var position = E.GetPosition(Grid);
 
             if (IsOutsideGrid(position))
@@ -399,6 +387,12 @@ void UIElement_OnMouseMove(object Sender, MouseEventArgs E)
                 return;
             }
 
+            // Show/hide circle based on DisplayHighlight setting
+            if (ServiceProvider.Get<Settings>().MousePointerOverlay.DisplayHighlight)
+                MousePointer.Visibility = Visibility.Visible;
+            else
+                MousePointer.Visibility = Visibility.Collapsed;
+
             if (_dragging)
             {
                 UpdateMouseClickPosition(position);