Skip to content

Commit 49ad8c2

Browse files
NaBianNaBian
committed
fix: closed #1612 
1 parent 81e0d62 commit 49ad8c2

File tree

4 files changed

+72
-8
lines changed

4 files changed

+72
-8
lines changed

‎src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,15 @@
7171
<ColumnDefinition Width="Auto" />
7272
<ColumnDefinition />
7373
</Grid.ColumnDefinitions>
74-
<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">
74+
<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">
75+
<Button.Visibility>
76+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
77+
<MultiBinding.Bindings>
78+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
79+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
80+
</MultiBinding.Bindings>
81+
</MultiBinding>
82+
</Button.Visibility>
7583
<interactivity:Interaction.Triggers>
7684
<interactivity:EventTrigger EventName="MouseDoubleClick">
7785
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
@@ -172,7 +180,15 @@
172180
<ColumnDefinition Width="Auto" />
173181
<ColumnDefinition />
174182
</Grid.ColumnDefinitions>
175-
<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">
183+
<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">
184+
<Button.Visibility>
185+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
186+
<MultiBinding.Bindings>
187+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
188+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
189+
</MultiBinding.Bindings>
190+
</MultiBinding>
191+
</Button.Visibility>
176192
<interactivity:Interaction.Triggers>
177193
<interactivity:EventTrigger EventName="MouseDoubleClick">
178194
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />

‎src/Net_40/HandyControl_Net_40/Themes/Theme.xaml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4754,7 +4754,15 @@
47544754
<ColumnDefinition Width="Auto" />
47554755
<ColumnDefinition />
47564756
</Grid.ColumnDefinitions>
4757-
<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">
4757+
<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">
4758+
<Button.Visibility>
4759+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
4760+
<MultiBinding.Bindings>
4761+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
4762+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
4763+
</MultiBinding.Bindings>
4764+
</MultiBinding>
4765+
</Button.Visibility>
47584766
<interactivity:Interaction.Triggers>
47594767
<interactivity:EventTrigger EventName="MouseDoubleClick">
47604768
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
@@ -4854,7 +4862,15 @@
48544862
<ColumnDefinition Width="Auto" />
48554863
<ColumnDefinition />
48564864
</Grid.ColumnDefinitions>
4857-
<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">
4865+
<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">
4866+
<Button.Visibility>
4867+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
4868+
<MultiBinding.Bindings>
4869+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
4870+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
4871+
</MultiBinding.Bindings>
4872+
</MultiBinding>
4873+
</Button.Visibility>
48584874
<interactivity:Interaction.Triggers>
48594875
<interactivity:EventTrigger EventName="MouseDoubleClick">
48604876
<interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />

‎src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,15 @@
7070
<ColumnDefinition Width="Auto" />
7171
<ColumnDefinition />
7272
</Grid.ColumnDefinitions>
73-
<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">
73+
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
74+
<Button.Visibility>
75+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
76+
<MultiBinding.Bindings>
77+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
78+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
79+
</MultiBinding.Bindings>
80+
</MultiBinding>
81+
</Button.Visibility>
7482
<interactivity:Interaction.Triggers>
7583
<interactivity:EventTrigger EventName="MouseDoubleClick">
7684
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
@@ -171,7 +179,15 @@
171179
<ColumnDefinition Width="Auto" />
172180
<ColumnDefinition />
173181
</Grid.ColumnDefinitions>
174-
<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">
182+
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
183+
<Button.Visibility>
184+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
185+
<MultiBinding.Bindings>
186+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
187+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
188+
</MultiBinding.Bindings>
189+
</MultiBinding>
190+
</Button.Visibility>
175191
<interactivity:Interaction.Triggers>
176192
<interactivity:EventTrigger EventName="MouseDoubleClick">
177193
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />

‎src/Shared/HandyControl_Shared/Themes/Theme.xaml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4754,7 +4754,15 @@
47544754
<ColumnDefinition Width="Auto" />
47554755
<ColumnDefinition />
47564756
</Grid.ColumnDefinitions>
4757-
<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">
4757+
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
4758+
<Button.Visibility>
4759+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
4760+
<MultiBinding.Bindings>
4761+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
4762+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
4763+
</MultiBinding.Bindings>
4764+
</MultiBinding>
4765+
</Button.Visibility>
47584766
<interactivity:Interaction.Triggers>
47594767
<interactivity:EventTrigger EventName="MouseDoubleClick">
47604768
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
@@ -4854,7 +4862,15 @@
48544862
<ColumnDefinition Width="Auto" />
48554863
<ColumnDefinition />
48564864
</Grid.ColumnDefinitions>
4857-
<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">
4865+
<Button Name="ButtonIcon" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
4866+
<Button.Visibility>
4867+
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
4868+
<MultiBinding.Bindings>
4869+
<Binding Path="ShowIcon" RelativeSource="{RelativeSource TemplatedParent}" />
4870+
<Binding Path="Icon" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
4871+
</MultiBinding.Bindings>
4872+
</MultiBinding>
4873+
</Button.Visibility>
48584874
<interactivity:Interaction.Triggers>
48594875
<interactivity:EventTrigger EventName="MouseDoubleClick">
48604876
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />

0 commit comments

Comments
 (0)