Maybe making canvas transparent while picking from reference layer is…

… less confusing?
PixiEditor · May 5, 2023 · 82995ef · 82995ef
1 parent 8b57dde
commit 82995ef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ColorPickerToolViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ColorPickerToolViewModel.cs
@@ -24,17 +24,31 @@ internal class ColorPickerToolViewModel : ToolViewModel
     private bool pickFromCanvas = true;
     public bool PickFromCanvas
     {
-        get => pickFromCanvas; 
-        private set => SetProperty(ref pickFromCanvas, value);
+        get => pickFromCanvas;
+        private set
+        {
+            if (SetProperty(ref pickFromCanvas, value))
+            {
+                RaisePropertyChanged(nameof(PickOnlyFromReferenceLayer));
+            }
+        }
     }
 
     private bool pickFromReferenceLayer = true;
     public bool PickFromReferenceLayer
     {
-        get => pickFromReferenceLayer; 
-        private set => SetProperty(ref pickFromReferenceLayer, value);
+        get => pickFromReferenceLayer;
+        private set
+        {
+            if (SetProperty(ref pickFromReferenceLayer, value))
+            {
+                RaisePropertyChanged(nameof(PickOnlyFromReferenceLayer));
+            }
+        }
     }
 
+    public bool PickOnlyFromReferenceLayer => !pickFromCanvas && pickFromReferenceLayer;
+
     [Settings.Enum("SCOPE_LABEL", DocumentScope.AllLayers)]
     public DocumentScope Mode => GetValue<DocumentScope>();
 

diff --git a/src/PixiEditor/Views/UserControls/Viewport.xaml b/src/PixiEditor/Views/UserControls/Viewport.xaml
@@ -175,7 +175,7 @@
                         Width="{Binding Document.Width}"
                         Height="{Binding Document.Height}"
                         Source="{Binding TargetBitmap}"
-                        Visibility="{Binding Source={vm:ToolVM ColorPickerToolViewModel}, Path=PickFromCanvas, Converter={converters:BoolToHiddenVisibilityConverter}}"
+                        Opacity="{Binding Source={vm:ToolVM ColorPickerToolViewModel}, Path=PickOnlyFromReferenceLayer, Mode=OneWay, Converter={converters:BoolToValueConverter FalseValue=1.0, TrueValue=0.1}}"
                         RenderOptions.BitmapScalingMode="{Binding Zoombox.Scale, Converter={converters:ScaleToBitmapScalingModeConverter}}"/>
                     <Grid ZIndex="5">
                         <symOverlay:SymmetryOverlay