Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #34

Merged
merged 21 commits into from
May 14, 2023
Merged

Dev #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
94fb61e
Add resource and control x:key prefix WD.
yanjinhuagood May 7, 2023
8b88996
CodeViewer IsReadOnly = true
yanjinhuagood May 14, 2023
3f75548
delete backup csproj
yanjinhuagood May 14, 2023
11fb8a4
Delete IndexConverter.cs
yanjinhuagood May 14, 2023
a1a4435
update files
yanjinhuagood May 14, 2023
de63cbf
Update DrawerMenuExample.xaml.cs
yanjinhuagood May 14, 2023
d338090
Create StepIndexConverter.cs
yanjinhuagood May 14, 2023
0a38fd1
Update StarrySky.cs
yanjinhuagood May 14, 2023
9b3411c
Update Styles.DataGrid.xaml
yanjinhuagood May 14, 2023
57ab865
Update Styles.Hyperlink.xaml
yanjinhuagood May 14, 2023
b0c91b5
Update Styles.Loading.xaml
yanjinhuagood May 14, 2023
b70d370
Update Styles.Menu.xaml
yanjinhuagood May 14, 2023
7663170
Update Styles.MessageBox.xaml
yanjinhuagood May 14, 2023
5ca2907
Update Styles.TextBlock.xaml
yanjinhuagood May 14, 2023
94c43b2
Update ControlBasic.xaml
yanjinhuagood May 14, 2023
cc50340
Update Geometrys.xaml
yanjinhuagood May 14, 2023
72f2750
Update MultiSelectSearchComboBox.xaml
yanjinhuagood May 14, 2023
34dd068
Update DrawerMenu.xaml
yanjinhuagood May 14, 2023
d0a3545
Update ScreenCut.xaml
yanjinhuagood May 14, 2023
c2721da
Update Step.xaml
yanjinhuagood May 14, 2023
256a99a
Add BreakCrumbBar control
yanjinhuagood May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/WPFDevelopers.Net40/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter"/>

<Style TargetType="{x:Type wpfdev:Window}" BasedOn="{x:Null}">
<Setter Property="Foreground" Value="{DynamicResource WindowForegroundColorBrush}" />
<Setter Property="Background" Value="{DynamicResource BackgroundSolidColorBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WindowBorderBrushSolidColorBrush}" />
<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="SnapsToDevicePixels" Value="True"/>
<Setter Property="UseLayoutRounding" Value="True" />
<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
<Setter Property="WindowStyle" Value="None" />
<Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}"/>
<Setter Property="FontFamily" Value="{DynamicResource NormalFontFamily}" />
<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
<Setter Property="shell:WindowChrome.WindowChrome">
<Setter.Value>
<shell:WindowChrome GlassFrameThickness="0,0,0,.1"
Expand Down Expand Up @@ -49,48 +49,48 @@
Visibility="{TemplateBinding Icon,Converter={StaticResource ObjectNullToVisibilityConverter}}"/>
<TextBlock Text="{TemplateBinding Title}" x:Name="PART_Title" Margin="6,0"
Foreground="{TemplateBinding Foreground}" Grid.Column="1"
VerticalAlignment="Center" FontSize="{DynamicResource TitleFontSize}"/>
VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}"/>
<WrapPanel Grid.Column="2" shell:WindowChrome.IsHitTestVisibleInChrome="True"
Margin="0,6">
<WrapPanel x:Name="PART_MinAndMax">
<Button Name="PART_MinimizeButton" IsTabStop="False" Padding="0"
Style="{DynamicResource WindowButtonStyle}"
Style="{DynamicResource WD.WindowButtonStyle}"
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0 7 0 0"
VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
</Grid>
</Button>
<Button Name="PART_MaximizeButton" IsTabStop="False" Padding="0"
Style="{DynamicResource WindowButtonStyle}"
Style="{DynamicResource WD.WindowButtonStyle}"
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path Width="10" Height="10"
HorizontalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource PathMetroWindowMaximize}" Fill="{TemplateBinding Foreground}"
Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{TemplateBinding Foreground}"
Stretch="Fill" UseLayoutRounding="False" />
</Grid>
</Button>
<Button Name="PART_RestoreButton" IsTabStop="False" Padding="0"
Style="{DynamicResource WindowButtonStyle}"
Style="{DynamicResource WD.WindowButtonStyle}"
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
Visibility="Collapsed">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path Width="10" Height="10"
HorizontalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource PathMetroWindowRestore}" Fill="{TemplateBinding Foreground}"
Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{TemplateBinding Foreground}"
Stretch="Fill" UseLayoutRounding="False" />
</Grid>
</Button>
</WrapPanel>

<Button Name="PART_CloseButton"
IsTabStop="False" Style="{DynamicResource WindowButtonStyle}"
IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}"
Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}">
<Path Width="10" Height="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource PathMetroWindowClose}"
Data="{DynamicResource WD.WindowCloseGeometry}"
Fill="{TemplateBinding Foreground}"
Stretch="Fill" />
</Button>
Expand Down
Loading