found big issue.... more tomorrow.

LoneWandererProductions · Nov 25, 2024 · 937cec8 · 937cec8
1 parent dd30218
commit 937cec8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/SlimViewer/MainWindow.xaml b/SlimViewer/MainWindow.xaml
@@ -292,7 +292,7 @@
                         <Button Content="Clean" Command="{Binding CleanTempFolder}" Grid.Column="2" />
                     </Grid>
                     <Separator />
-                    <CheckBox IsChecked="{Binding ElementName=ImageZoom, Path=AutoplayGifImage}">Autoplay Gif</CheckBox>
+                    <CheckBox IsChecked="{Binding ElementName=ImageControl, Path=AutoplayGifImage}">Autoplay Gif</CheckBox>
                 </MenuItem>
                 <MenuItem Header="Experimental">
                     <MenuItem Header="Open Cif" Command="{Binding OpenCommandCif}" />
@@ -312,7 +312,7 @@
             <ContentControl Grid.Row="0" Grid.Column="8" Content="{Binding SelectedTool}"
                             ContentTemplateSelector="{DynamicResource  ToolOptionsTemplateSelector}"
                             Grid.RowSpan="4" />
-            <Slider Minimum="0.1" Maximum="5.0" Value="{Binding ZoomScale, ElementName=ImageZoom, Mode=TwoWay}"
+            <Slider Minimum="0.1" Maximum="5.0" Value="{Binding ZoomScale, ElementName=ImageControl, Mode=TwoWay}"
                     Grid.Row="2" Grid.Column="2" IsEnabled="{Binding Path =IsActive}" />
 
         </Grid>
@@ -330,8 +330,8 @@
                 IsTabStop="True"
                 ItemsSource="{Binding Bmp}"
                 ImageGifPath="{Binding GifPath}"
-                Name="ImageZoom"
-                SelectionTool="{Binding ImageZoomTool, Mode=TwoWay}"
+                x:Name="ImageControl"
+                SelectionTool="{Binding ImageZoomTool}"
                 SelectedFrameCommand="{Binding SelectedFrameCommand}"
                 SelectedPointCommand="{Binding SelectedPointCommand}" />
         </Grid>

diff --git a/SlimViewer/MainWindow.xaml.cs b/SlimViewer/MainWindow.xaml.cs
@@ -40,12 +40,13 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
 
             SlimViewerRegister.SetRegister(obj);
 
+            //TODO rework and set:
             View = new ImageView(obj.MainSubFolders, obj.MainCompressCif, obj.MainSimilarity,
-                obj.MainAutoClean) { Main = this, Thumb = Thumbnail, Picker = ColorPick, ImageZoom = ImageZoom };
+                obj.MainAutoClean, ImageControl) { Main = this, Thumb = Thumbnail, Picker = ColorPick };
 
             DataContext = View;
 
-            ImageZoom.AutoplayGifImage = obj.MainAutoPlayGif;
+            ImageControl.AutoplayGifImage = obj.MainAutoPlayGif;
         }
 
         /// <summary>

diff --git a/SlimViews/ImageView.cs b/SlimViews/ImageView.cs
@@ -453,12 +453,14 @@ public ImageView()
         /// <param name="compressCif">if set to <c>true</c> [compress cif].</param>
         /// <param name="similarity">The similarity.</param>
         /// <param name="autoClean">if set to <c>true</c> [automatic clean].</param>
-        public ImageView(bool subFolders, bool compressCif, int similarity, bool autoClean)
+        /// <param name="imageZoom"></param>
+        public ImageView(bool subFolders, bool compressCif, int similarity, bool autoClean, ImageZoom imageZoom)
         {
             SubFolders = subFolders;
             Compress = compressCif;
             Similarity = similarity;
             AutoClean = autoClean;
+            ImageZoomControl = imageZoom;
 
             Initialize();
         }
@@ -1273,7 +1275,7 @@ public ImageZoomTools ImageZoomTool
         /// <value>
         ///     The image zoom.
         /// </value>
-        public ImageZoom ImageZoom { get; init; }
+        public ImageZoom ImageZoomControl { get; set; }
 
         /// <summary>
         ///     Initializes this instance.
@@ -1301,6 +1303,7 @@ private void Initialize()
                 { Key.Right, NextCommand }
             };
 
+
             PropertyChanged += OnPropertyChanged;
         }
 
@@ -1339,7 +1342,7 @@ private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
                     CurrentFilter = Translator.GetFilterFromString(SelectedFilter);
                     break;
                 case nameof(SelectedToolType):
-                    ImageZoomTool = Translator.GetToolsFromString(SelectedToolType);
+                    if (ImageZoomControl != null) ImageZoomControl.SelectionTool = Translator.GetToolsFromString(SelectedToolType);
                     break;
             }
         }
@@ -1436,7 +1439,7 @@ private void ColorChangedAction(ColorHsv colorHsv)
         private void CloseAction(object obj)
         {
             var config = SlimViewerRegister.GetRegister();
-            config.MainAutoPlayGif = ImageZoom.AutoplayGifImage;
+            config.MainAutoPlayGif = ImageZoomControl.AutoplayGifImage;
 
             Config.SetConfig(config);
             if (AutoClean) CleanTempAction(true);