Updates to v3.6.10 (FlyleafLib) / v1.2.8 (FlyleafME)

Player: Changes Zoom from pixels to percentage Player: Introduces ZoomIn, ZoomOut based on specific Point Config: Changes Player.ZoomOffset from 50 to 10 (as now indicates percentage instead of pixels) FlyleafHost (WPF/WinForms): Improves Zoom with Ctrl+MouseWheel to use mouse pointer as center FlyleafME: Adds Zoom percentage to pop-up menu FlyleafME: Adds Zoom Offset to Settings
SuRGeoNix · Feb 16, 2023 · 8bfddd3 · 8bfddd3
1 parent 43bd69f
commit 8bfddd3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj b/FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net7.0-windows;net6.0-windows;net472</TargetFrameworks>
 	<UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Version>1.2.7</Version>
+    <Version>1.2.8</Version>
     <Authors>SuRGeoNix</Authors>
     <Copyright>SuRGeoNix © 2022</Copyright>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
@@ -14,6 +14,8 @@
     <PackageTags>flyleaf flyleaflib flyleafme video audio wpf media player element control</PackageTags>
     <Description>FlyleafME: A WPF Media Element Control (based on FlyleafLib)</Description>
     <PackageReleaseNotes>
+		Adds Zoom percentage to pop-up menu
+		Adds Zoom Offset to Settings
 		Updates FlyleafLib
 	</PackageReleaseNotes>
   </PropertyGroup>

diff --git a/FlyleafLib.Controls.WPF/Settings.xaml b/FlyleafLib.Controls.WPF/Settings.xaml
@@ -368,6 +368,7 @@
                                     <RowDefinition Height="30"/>
                                     <RowDefinition Height="30"/>
                                     <RowDefinition Height="30"/>
+                                    <RowDefinition Height="30"/>
                                     <RowDefinition Height="*"/>
                                 </Grid.RowDefinitions>
 
@@ -431,7 +432,10 @@
                                 <TextBlock Grid.Row="11" Text="HDR to SDR Tone" VerticalAlignment="Center"/>
                                 <TextBox Grid.Row="11" Grid.Column="1" Style="{StaticResource FLTextbox}" Text="{Binding Config.Video.HDRtoSDRTone, UpdateSourceTrigger=LostFocus}"/>
 
-                                <StackPanel Orientation="Vertical" Grid.Row="12" Grid.ColumnSpan="3" Margin="0 10 0 0">
+                                <TextBlock Grid.Row="12" Text="Zoom Offset" VerticalAlignment="Center"/>
+                                <TextBox Grid.Row="12" Grid.Column="1" Style="{StaticResource FLTextbox}" Text="{Binding Config.Player.ZoomOffset, UpdateSourceTrigger=LostFocus}"/>
+
+                                <StackPanel Orientation="Vertical" Grid.Row="13" Grid.ColumnSpan="3" Margin="0 10 0 0">
                                     <ItemsControl ItemsSource="{Binding Config.Video.Filters.Values}">
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate>

diff --git a/FlyleafLib/Controls/WPF/FlyleafHost.cs b/FlyleafLib/Controls/WPF/FlyleafHost.cs
@@ -1144,7 +1144,7 @@ private void Overlay_MouseWheel(object sender, MouseWheelEventArgs e)
             if      ((Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) &&
                 (PanZoomOnCtrlWheel == AvailableWindows.Overlay || PanZoomOnCtrlWheel == AvailableWindows.Both))
             {
-                Point cur = e.GetPosition(Surface);
+                Point cur = e.GetPosition(Overlay);
                 Point curDpi = new Point(cur.X * DpiX, cur.Y * DpiY);
                 if (e.Delta > 0)
                     Player.ZoomIn(curDpi);

diff --git a/FlyleafLib/Engine/Config.cs b/FlyleafLib/Engine/Config.cs
@@ -249,7 +249,9 @@ public long     MaxLatency {
             public long     SubtitlesDelayOffset2       { get; set; } = 1000 * 10000;
             public long     SeekOffset                  { get; set; } = 5 * (long)1000 * 10000;
             public long     SeekOffset2                 { get; set; } = 15 * (long)1000 * 10000;
-            public int      ZoomOffset                  { get; set; } = 10;
+            public int      ZoomOffset                  { get => _ZoomOffset; set { if (Set(ref _ZoomOffset, value)) player?.ResetAll(); } }
+            int _ZoomOffset = 10;
+
             public int      VolumeOffset                { get; set; } = 5;
         }
         public class DemuxerConfig : NotifyPropertyChanged

diff --git a/FlyleafLib/FlyleafLib.csproj b/FlyleafLib/FlyleafLib.csproj
@@ -8,7 +8,7 @@
 	<PackageIconUrl />
 	<RepositoryUrl></RepositoryUrl>
 	<Description>Media Player .NET Library for WPF/WinForms (based on FFmpeg/DirectX)</Description>
-	<Version>3.6.9</Version>
+	<Version>3.6.10</Version>
 	<Authors>SuRGeoNix</Authors>
 	<Copyright>SuRGeoNix © 2022</Copyright>
 	<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
@@ -17,7 +17,10 @@
 	<IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageReleaseNotes>
-		Fixes a possible crashing issue with threading and ObservableCollections (it could happen on audio device changes)
+		Player: Changes Zoom from pixels to percentage
+        Player: Introduces ZoomIn, ZoomOut based on specific Point
+        Config: Changes Player.ZoomOffset from 50 to 10 (as now indicates percentage instead of pixels)
+        FlyleafHost (WPF/WinForms): Improves Zoom with Ctrl+MouseWheel to use mouse pointer as center
 	</PackageReleaseNotes>
   </PropertyGroup>