Skip to content

Commit

Permalink
Update Net40 Styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghost1372
ghost1372 committed Mar 30, 2022
1 parent 8b3ac56 commit 3b563f9
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Button Command="{x:Static DataGrid.SelectAllCommand}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
<Button.Visibility>
<ToggleButton Margin="0,0,0,6" hc:DataGridAttach.CurrentDataGrid="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}" hc:DataGridAttach.IsSelectAll="{Binding IsChecked,RelativeSource={RelativeSource Self}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" hc:IconSwitchElement.Geometry="{StaticResource AllGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}" Style="{StaticResource ToggleButtonIconTransparent}">
<ToggleButton.Visibility>
<MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
<Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
<Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
</MultiBinding>
</Button.Visibility>
</Button>
</ToggleButton.Visibility>
</ToggleButton>
<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
<hc:ToggleBlock.CheckedContent>
Expand Down
36 changes: 32 additions & 4 deletions src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
<Grid Panel.ZIndex="1" Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
Expand Down Expand Up @@ -111,7 +111,7 @@
<ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
</Grid>
</Grid>
<AdornerDecorator Grid.Row="1">
<AdornerDecorator x:Name="AdornerDecorator" Grid.Row="1">
<ContentPresenter ClipToBounds="True"/>
</AdornerDecorator>
<ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed"/>
Expand Down Expand Up @@ -155,16 +155,44 @@
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}"/>
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}"/>
</Trigger>
<Trigger Property="WindowStyle" Value="None">
<Setter Property="ShowNonClientArea" Value="False"/>
<Trigger Property="ExtendViewIntoNonClientArea" Value="True">
<Setter TargetName="AdornerDecorator" Property="Grid.Row" Value="0" />
<Setter TargetName="AdornerDecorator" Property="Grid.RowSpan" Value="2" />
<Setter Property="ShowTitle" Value="False"/>
<Setter Property="NonClientAreaBackground" Value="Transparent"/>
</Trigger>
<Trigger Property="ShowCloseButton" Value="False">
<Setter TargetName="ButtonClose" Property="Visibility" Value="Collapsed" />
</Trigger>
<Trigger Property="ShowMinButton" Value="False">
<Setter TargetName="ButtonMin" Property="Visibility" Value="Collapsed" />
</Trigger>
<Trigger Property="ShowMaxButton" Value="False">
<Setter TargetName="ButtonMax" Property="Visibility" Value="Collapsed" />
<Setter TargetName="ButtonRestore" Property="Visibility" Value="Collapsed" />
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ShowCloseButton" Value="False"/>
<Condition Property="ShowMaxButton" Value="False"/>
<Condition Property="ShowMinButton" Value="False"/>
</MultiTrigger.Conditions>
<Setter TargetName="ButtonClose" Property="Visibility" Value="Hidden" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ResizeMode" Value="CanResizeWithGrip"/>
<Condition Property="WindowState" Value="Normal" />
</MultiTrigger.Conditions>
<Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="WindowStyle" Value="None"/>
<Condition Property="ApplyBackdropMaterial" Value="False" />
</MultiTrigger.Conditions>
<Setter Property="ShowNonClientArea" Value="False"/>
</MultiTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
Expand Down

0 comments on commit 3b563f9

Please sign in to comment.