修复颜色错误
This commit is contained in:
@@ -8,6 +8,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=viewmodels:AboutDialogViewModel}"
|
d:DataContext="{d:DesignInstance Type=viewmodels:AboutDialogViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_Abount}"
|
Title="{DynamicResource Str_Abount}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Height="300"
|
Height="300"
|
||||||
Width="500"
|
Width="500"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=viewmodels:DiagnosticsDialogViewModel}"
|
d:DataContext="{d:DesignInstance Type=viewmodels:DiagnosticsDialogViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_Diagnostics}"
|
Title="{DynamicResource Str_Diagnostics}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Height="450"
|
Height="450"
|
||||||
Width="800"
|
Width="800"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=exporters:CustomFFmpegExporterViewModel}"
|
d:DataContext="{d:DesignInstance Type=exporters:CustomFFmpegExporterViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_CustomFFmpegExporterTitle}"
|
Title="{DynamicResource Str_CustomFFmpegExporterTitle}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Width="450"
|
Width="450"
|
||||||
Height="800"
|
Height="800"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
@@ -47,7 +48,6 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Right"/>
|
<Setter Property="HorizontalAlignment" Value="Right"/>
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
||||||
<Setter Property="BorderBrush" Value="LightGray"/>
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
||||||
<Setter Property="Margin" Value="0 5 0 10"/>
|
<Setter Property="Margin" Value="0 5 0 10"/>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=vmexp:FFmpegVideoExporterViewModel}"
|
d:DataContext="{d:DesignInstance Type=vmexp:FFmpegVideoExporterViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_FFmpegVideoExporterTitle}"
|
Title="{DynamicResource Str_FFmpegVideoExporterTitle}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Width="450"
|
Width="450"
|
||||||
Height="750"
|
Height="750"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
@@ -47,7 +48,6 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Right"/>
|
<Setter Property="HorizontalAlignment" Value="Right"/>
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
||||||
<Setter Property="BorderBrush" Value="LightGray"/>
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
||||||
<Setter Property="Margin" Value="0 5 0 10"/>
|
<Setter Property="Margin" Value="0 5 0 10"/>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=vmexp:FrameExporterViewModel}"
|
d:DataContext="{d:DesignInstance Type=vmexp:FrameExporterViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_FrameExporterTitle}"
|
Title="{DynamicResource Str_FrameExporterTitle}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Width="450"
|
Width="450"
|
||||||
Height="480"
|
Height="480"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
@@ -47,7 +48,6 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Right"/>
|
<Setter Property="HorizontalAlignment" Value="Right"/>
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
||||||
<Setter Property="BorderBrush" Value="LightGray"/>
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
||||||
<Setter Property="Margin" Value="0 5 0 10"/>
|
<Setter Property="Margin" Value="0 5 0 10"/>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=vmexp:FrameSequenceExporterViewModel}"
|
d:DataContext="{d:DesignInstance Type=vmexp:FrameSequenceExporterViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_FrameSequenceExporterTitle}"
|
Title="{DynamicResource Str_FrameSequenceExporterTitle}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Width="450"
|
Width="450"
|
||||||
Height="550"
|
Height="550"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
@@ -47,7 +48,6 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Right"/>
|
<Setter Property="HorizontalAlignment" Value="Right"/>
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
||||||
<Setter Property="BorderBrush" Value="LightGray"/>
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
||||||
<Setter Property="Margin" Value="0 5 0 10"/>
|
<Setter Property="Margin" Value="0 5 0 10"/>
|
||||||
|
|||||||
@@ -954,14 +954,15 @@
|
|||||||
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
|
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
|
||||||
</Popup>
|
</Popup>
|
||||||
</Border>
|
</Border>
|
||||||
<Button DockPanel.Dock="Right"
|
<Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
|
||||||
Content="..."
|
<Button Content="..."
|
||||||
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
|
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
|
||||||
Click="ButtonPickColor_Click">
|
Click="ButtonPickColor_Click">
|
||||||
<Button.Background>
|
<Button.Background>
|
||||||
<SolidColorBrush Color="{Binding BackgroundColor}"/>
|
<SolidColorBrush Color="{Binding BackgroundColor}"/>
|
||||||
</Button.Background>
|
</Button.Background>
|
||||||
</Button>
|
</Button>
|
||||||
|
</Border>
|
||||||
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
|
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=models:PreferenceModel}"
|
d:DataContext="{d:DesignInstance Type=models:PreferenceModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{DynamicResource Str_Preference}"
|
Title="{DynamicResource Str_Preference}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Height="650"
|
Height="650"
|
||||||
Width="600"
|
Width="600"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
@@ -44,7 +45,6 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Right"/>
|
<Setter Property="HorizontalAlignment" Value="Right"/>
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
|
||||||
<Setter Property="BorderBrush" Value="LightGray"/>
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
|
||||||
<Setter Property="Margin" Value="0 5 0 10"/>
|
<Setter Property="Margin" Value="0 5 0 10"/>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
d:DataContext="{d:DesignInstance Type=vm:ProgressDialogViewModel}"
|
d:DataContext="{d:DesignInstance Type=vm:ProgressDialogViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{Binding Title}"
|
Title="{Binding Title}"
|
||||||
|
Background="{StaticResource RegionBrush}"
|
||||||
Width="550"
|
Width="550"
|
||||||
Height="250"
|
Height="250"
|
||||||
ResizeMode="NoResize"
|
ResizeMode="NoResize"
|
||||||
|
|||||||
Reference in New Issue
Block a user