still broken animatino

Iemand005 · Iemand005 · commit 8158dc896f42 · 2026-02-12T03:51:36.000+01:00
diff --git a/IRCameraViewShared/CameraPage.cs b/IRCameraViewShared/CameraPage.cs
@@ -18,6 +18,7 @@
 using System.Threading.Tasks;
 using Windows.UI.Core;
 using System.Collections.ObjectModel;
+using System.Numerics;
 
 
 
@@ -105,36 +106,40 @@ void ReloadDevices()
 
         }
 
-        void EnableMargin()
+        void AnimateImageGrid(double targetWidth, double targetHeight, double offsetX, double offsetY, double durationMs = 300)
         {
             var visual = ElementCompositionPreview.GetElementVisual(ImageGrid);
             var compositor = visual.Compositor;
 
-            // Calculate offset you want (simulates Margin change)
-            var targetOffset = new System.Numerics.Vector3(
-                x: (float)(20 + PhotoButton.ActualWidth * 2),
-                y: (float)(32 + 20),
-                z: 0f);
+            var offsetAnim = compositor.CreateVector3KeyFrameAnimation();
+            offsetAnim.InsertKeyFrame(1f, new Vector3((float)offsetX, (float)offsetY, 0));
+            offsetAnim.Duration = TimeSpan.FromMilliseconds(durationMs);
+            visual.StartAnimation(nameof(visual.Offset), offsetAnim);
+
+            var sizeAnim = compositor.CreateVector2KeyFrameAnimation();
+            sizeAnim.InsertKeyFrame(1f, new Vector2((float)targetWidth, (float)targetHeight));
+            sizeAnim.Duration = TimeSpan.FromMilliseconds(durationMs);
+            visual.StartAnimation("Size", sizeAnim);
+
+            ImageViewbox.Stretch = (targetWidth > targetHeight) ? Stretch.Uniform : Stretch.UniformToFill;
+        }
 
-            var animation = compositor.CreateVector3KeyFrameAnimation();
-            animation.InsertKeyFrame(1f, targetOffset);
-            animation.Duration = TimeSpan.FromMilliseconds(300);
+        void EnableMargin()
+        {
+            double newWidth = ImageGrid.ActualWidth - 20 - PhotoButton.ActualWidth - PhotoButton.Margin.Left;  // example
+            double newHeight = ImageGrid.ActualHeight - 40 - SettingsViewer.ActualHeight;
 
-            visual.StartAnimation(nameof(visual.Offset), animation);
+            double offsetX = -20;
+            double offsetY = 32 + 20;
+
+            AnimateImageGrid(newWidth, newHeight, offsetX, offsetY);
 
             ImageViewbox.Stretch = Stretch.Uniform;
         }
 
         void DisableMargin()
         {
-            var visual = ElementCompositionPreview.GetElementVisual(ImageGrid);
-            var compositor = visual.Compositor;
-
-            var animation = compositor.CreateVector3KeyFrameAnimation();
-            animation.InsertKeyFrame(1f, new System.Numerics.Vector3(0, 0, 0));
-            animation.Duration = TimeSpan.FromMilliseconds(300);
-
-            visual.StartAnimation(nameof(visual.Offset), animation);
+            AnimateImageGrid(ImageGrid.ActualWidth, ImageGrid.ActualHeight, 0, 0);
 
             ImageViewbox.Stretch = Stretch.UniformToFill;
         }
diff --git a/IRCameraViewShared/CameraPage.xaml b/IRCameraViewShared/CameraPage.xaml
@@ -31,7 +31,7 @@
                 </Button.Background>
             </Button>
         </Grid>
-        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Enabled">
+        <ScrollViewer x:Name="SettingsViewer" Grid.Row="1" HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Enabled">
             <Grid Margin="20">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
