fix: closed #1612
This commit is contained in:
1 parent
81e0d6226b
commit
49ad8c2987
4 files changed
+72
-8
No files matched your search
@@ -71,7 +71,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
||||||
@@ -172,7 +180,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
||||||
|
|||||||
@@ -4754,7 +4754,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
||||||
@@ -4854,7 +4862,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
|
||||||
|
|||||||
@@ -70,7 +70,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
||||||
@@ -171,7 +179,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
||||||
|
|||||||
@@ -4754,7 +4754,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
||||||
@@ -4854,7 +4862,15 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
|
||||||
|
<Button.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
|
||||||
|
<MultiBinding.Bindings>
|
||||||
|
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
|
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
|
||||||
|
</MultiBinding.Bindings>
|
||||||
|
</MultiBinding>
|
||||||
|
</Button.Visibility>
|
||||||
<interactivity:Interaction.Triggers>
|
<interactivity:Interaction.Triggers>
|
||||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||||
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
||||||
|
|||||||
Reference in new issue
Block a user