flabbet преди 3 години
родител
ревизия
4538e210ce
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      PixiEditor/PixiEditor.csproj
  2. 1 1
      PixiEditor/Views/UserControls/ToolSettingColorPicker.xaml

+ 1 - 1
PixiEditor/PixiEditor.csproj

@@ -202,7 +202,7 @@
 			<NoWarn>NU1701</NoWarn>
 		</PackageReference>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-		<PackageReference Include="PixiEditor.ColorPicker" Version="3.3.0" />
+		<PackageReference Include="PixiEditor.ColorPicker" Version="3.3.1" />
 		<PackageReference Include="PixiEditor.Parser" Version="2.0.0.1" />
 		<PackageReference Include="PixiEditor.Parser.Skia" Version="2.0.0.1" />
 		<PackageReference Include="SkiaSharp" Version="2.80.3" />

+ 1 - 1
PixiEditor/Views/UserControls/ToolSettingColorPicker.xaml

@@ -12,7 +12,7 @@
              d:Background="{StaticResource AccentColor}">
     <colorpicker:PortableColorPicker Width="40" Height="20" x:Name="ColorPicker" UseHintColor="True"
                                      HintColor="{Binding DataContext.ColorsSubViewModel.PrimaryColor, 
-        RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, 
+        RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type PixiEditor:MainWindow}, AncestorLevel=0}, 
         Converter={converters:SKColorToMediaColorConverter}}"
                                      SelectedColor="{Binding SelectedColor, ElementName=uc, Mode=TwoWay}"/>
 </UserControl>