Skip to content

merge dev into master #147

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

Merged
merged 108 commits into from
Mar 15, 2025
Merged

merge dev into master #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
f09f700
Update Styles.Buttons.xaml
yanjinhuagood Jan 18, 2025
640464c
Update LoadingBase.cs
yanjinhuagood Jan 18, 2025
d6ee082
Fix issue （#134）
yanjinhuagood Jan 18, 2025
b89896d
Update Message.cs
yanjinhuagood Jan 18, 2025
9191619
Fix issue（ #136）
yanjinhuagood Jan 19, 2025
e826374
Create SimpleWrapPanel.cs
yanjinhuagood Jan 25, 2025
3c8c058
Update Mask.xaml
yanjinhuagood Jan 25, 2025
416e32f
Update WPFDevelopers.Shared.projitems
yanjinhuagood Jan 25, 2025
c2214ca
Create Tag
yanjinhuagood Jan 25, 2025
6ec69e8
Create TagExample
yanjinhuagood Jan 25, 2025
b4fd59b
update MultiSelectComboBox
yanjinhuagood Jan 25, 2025
1d7bbe4
AnimationNavigationBar3D is modified to NavMenu3D and the defect is r…
yanjinhuagood Feb 1, 2025
b62a38d
Update UserModel.cs
yanjinhuagood Feb 2, 2025
3417902
Update PathIcon.xaml
yanjinhuagood Feb 2, 2025
db3f338
Create NavMenu3D.xaml
yanjinhuagood Feb 2, 2025
adaeb95
Update Message
yanjinhuagood Feb 2, 2025
494d30f
Update Drawer.xaml
yanjinhuagood Feb 2, 2025
ed8cf1f
update in Theme
yanjinhuagood Feb 4, 2025
9e6cd3d
Update Generic.xaml
yanjinhuagood Feb 4, 2025
a0f2262
Update themes switch
yanjinhuagood Feb 15, 2025
f93497b
update in Themes
yanjinhuagood Feb 26, 2025
cf32810
Update Styles.TabControl.xaml
yanjinhuagood Feb 26, 2025
9309380
Update IndexToColor.cs
yanjinhuagood Feb 26, 2025
0858314
Update StarrySky.cs
yanjinhuagood Feb 26, 2025
a18bee2
Update ScreenCaptureExt.cs
yanjinhuagood Feb 26, 2025
b782b49
Update WDMessageBox.cs
yanjinhuagood Feb 26, 2025
75f68d9
Update DrawPrizeIndexToColor.cs
yanjinhuagood Feb 26, 2025
6fd837e
Update Window.cs
yanjinhuagood Feb 26, 2025
6fd3418
Update Badge.cs
yanjinhuagood Feb 26, 2025
b597002
Update BreathLamp.cs
yanjinhuagood Feb 26, 2025
dd5621a
Update ChartBase.cs
yanjinhuagood Feb 26, 2025
6e35fd6
Update ChartPie.cs
yanjinhuagood Feb 26, 2025
a0dd421
Update ChartRadar.cs
yanjinhuagood Feb 26, 2025
1696053
Update ChartRect.cs
yanjinhuagood Feb 26, 2025
836f874
Update MasterCarousel.cs
yanjinhuagood Feb 28, 2025
b50bfdb
add in Theme
yanjinhuagood Mar 3, 2025
4ceab08
Update App.xaml
yanjinhuagood Mar 3, 2025
dde3e3f
Update CropAvatar.cs
yanjinhuagood Mar 3, 2025
cfc63f7
Fix issue（#140 ）
yanjinhuagood Mar 3, 2025
10183d8
Fix issue （#140 ）
yanjinhuagood Mar 3, 2025
d2bdba6
Fix issue （#140 ）
yanjinhuagood Mar 3, 2025
d1ae70c
Update Styles.DatePicker.xaml
yanjinhuagood Mar 3, 2025
62e21cb
Update CropAvatarWindow.xaml
yanjinhuagood Mar 3, 2025
cf4a2ed
update in Resources.cs
yanjinhuagood Mar 3, 2025
a659097
remove WPFDevelopers Controls Theme
yanjinhuagood Mar 3, 2025
fc5619d
Update SpotLightExample.xaml
yanjinhuagood Mar 12, 2025
c6eeb7e
Update ScreenCutExample.xaml.cs
yanjinhuagood Mar 12, 2025
4e98b53
Update CropImageExample.xaml.cs
yanjinhuagood Mar 12, 2025
154c62f
Update Badge.cs
yanjinhuagood Mar 12, 2025
7fe0562
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood Mar 12, 2025
0abe4c7
Update BreathLamp.cs
yanjinhuagood Mar 12, 2025
de20786
Update EmphasizerCarousel.cs
yanjinhuagood Mar 12, 2025
6005e7a
Update MasterCarousel.cs
yanjinhuagood Mar 12, 2025
499ffef
Update ChartBase.cs
yanjinhuagood Mar 12, 2025
3472362
Update ChartPie.cs
yanjinhuagood Mar 12, 2025
7c9bfa2
Update ChartRadar.cs
yanjinhuagood Mar 12, 2025
67b1b96
Update ChartRect.cs
yanjinhuagood Mar 12, 2025
8c03a39
Update Window.cs
yanjinhuagood Mar 12, 2025
6f781bc
Update MonitorHelper.cs
yanjinhuagood Mar 12, 2025
0793242
Update ImagingHelper.cs
yanjinhuagood Mar 12, 2025
f421308
Update DatePickerHelper.cs
yanjinhuagood Mar 12, 2025
8d0dfd3
Update ControlsHelper.cs
yanjinhuagood Mar 12, 2025
fd9d665
Update IndexToColor.cs
yanjinhuagood Mar 12, 2025
e8c81cb
Update Loading.cs
yanjinhuagood Mar 12, 2025
4c2fe0e
Fix issue （#138 ）
yanjinhuagood Mar 12, 2025
cad3e14
Fix issue （#137 ）
yanjinhuagood Mar 12, 2025
fc7559b
Fix issue （#141）
yanjinhuagood Mar 12, 2025
1efda75
Fix issue（ #142 ）
yanjinhuagood Mar 14, 2025
a4426fb
Fix issue（ #146 ）
yanjinhuagood Mar 14, 2025
c2d13f0
Fix issue （#143 ）
yanjinhuagood Mar 15, 2025
f3b8010
Update DateRangePicker.cs
yanjinhuagood Mar 15, 2025
95f75de
Update VerifyCode.cs
yanjinhuagood Mar 15, 2025
57940b7
Update StarrySky.cs
yanjinhuagood Mar 15, 2025
f710bb2
Update ScreenCut.cs
yanjinhuagood Mar 15, 2025
97402a0
Update ScreenCaptureExt.cs
yanjinhuagood Mar 15, 2025
4d1ef10
Update ScreenCapture.cs
yanjinhuagood Mar 15, 2025
57d1fdd
Update WDMessageBox.cs
yanjinhuagood Mar 15, 2025
2e6c73c
Update SpotLight.cs
yanjinhuagood Mar 15, 2025
5cc712a
Update DrawingContextHelper.cs
yanjinhuagood Mar 15, 2025
f6bac3f
Update EnumerableHelper.cs
yanjinhuagood Mar 15, 2025
b3e503e
Update Carousel.xaml
yanjinhuagood Mar 15, 2025
bf85b15
Update SpotLight.xaml
yanjinhuagood Mar 15, 2025
5c4d2f1
Update WPFDevelopers.Shared.projitems
yanjinhuagood Mar 15, 2025
c49dcfc
Update Theme40.txt
yanjinhuagood Mar 15, 2025
37f1c62
Update Theme45x.txt
yanjinhuagood Mar 15, 2025
4b93e33
Fix issue （#144）
yanjinhuagood Mar 15, 2025
67e6e94
Update Resources.cs
yanjinhuagood Mar 15, 2025
c535a62
Update App.xaml
yanjinhuagood Mar 15, 2025
7cfdc2d
Update NavMenu3DExample.xaml
yanjinhuagood Mar 15, 2025
b3fae1e
Update Resources.cs
yanjinhuagood Mar 15, 2025
49c6aef
Update TargetFrameworks.props
yanjinhuagood Mar 15, 2025
9f219fb
add in CopyGeometry
yanjinhuagood Mar 15, 2025
e5d678f
Update BasicControlsExample.xaml
yanjinhuagood Mar 15, 2025
7ba04f7
Create UsageGuide
yanjinhuagood Mar 15, 2025
66e570d
Update WPFDevelopers.Net45x.csproj
yanjinhuagood Mar 15, 2025
53ef1a3
Create UsageColor
yanjinhuagood Mar 15, 2025
3fb2696
Update WPFDevelopers.sln
yanjinhuagood Mar 15, 2025
c2ce6e3
Update Theme.xaml
yanjinhuagood Mar 15, 2025
0a29fb7
Update Theme.xaml
yanjinhuagood Mar 15, 2025
c70b2d2
Fix issue （#138 ）
yanjinhuagood Mar 15, 2025
fada08b
Update MultiSelectComboBox.xaml
yanjinhuagood Mar 15, 2025
f04f2ae
Fix issue （#138）
yanjinhuagood Mar 15, 2025
c2fa27a
Fix issue （#138）
yanjinhuagood Mar 15, 2025
608e574
Fix issue （#138）
yanjinhuagood Mar 15, 2025
af1f05c
Fix issue （#138）
yanjinhuagood Mar 15, 2025
5016e05
Fix issue （#138）
yanjinhuagood Mar 15, 2025
bb27099
Fix issue （#138）
yanjinhuagood Mar 15, 2025
cdee8e0
Update Theme.xaml
yanjinhuagood Mar 15, 2025
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
4 changes: 2 additions & 2 deletions src/Resources.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AMap\Car2.png">
<Link>Resources\Images\AMap\Car2.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AnimationNavigationBar3D\background.png">
<Link>Resources\Images\AnimationNavigationBar3D\background.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\NavMenu3D\background.png">
<Link>Resources\Images\NavMenu3D\background.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\*.jpg">
<Link>Resources\Images\Breathe\%(Filename)%(Extension)</Link>
Expand Down
9 changes: 9 additions & 0 deletions src/TargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Win32.SystemEvents">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Win32.SystemEvents">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
<PackageReference Include="System.Drawing.Common">
Expand All @@ -36,5 +42,8 @@
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Win32.SystemEvents">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
</Project>
32 changes: 15 additions & 17 deletions src/WPFDevelopers.Net40/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
<Style BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
<Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrush}" />
<Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrush}" />
<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 WD.NormalFontFamily}" />
<Setter Property="FontFamily" Value="{DynamicResource WD.FontFamily}" />
<Setter Property="shell:WindowChrome.WindowChrome">
<Setter.Value>
<shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" />
Expand Down Expand Up @@ -70,7 +69,7 @@
VerticalAlignment="Center"
Content="{TemplateBinding Title}"
FontSize="{DynamicResource {x:Static SystemFonts.CaptionFontSizeKey}}"
Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
Foreground="{DynamicResource WD.WindowTextBrush}"
IsTabStop="False" />
</StackPanel>
<StackPanel
Expand All @@ -93,7 +92,7 @@
Height="1"
Margin="0,7,0,0"
VerticalAlignment="Bottom"
Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
Fill="{DynamicResource WD.WindowTextBrush}" />
</Grid>
</Button>
<Button
Expand All @@ -110,7 +109,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource WD.WindowMaximizeGeometry}"
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
Fill="{DynamicResource WD.WindowTextBrush}"
Stretch="Uniform"
UseLayoutRounding="False" />
</Grid>
Expand All @@ -130,7 +129,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource WD.WindowRestoreGeometry}"
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
Fill="{DynamicResource WD.WindowTextBrush}"
Stretch="Uniform"
UseLayoutRounding="False" />
</Grid>
Expand All @@ -149,7 +148,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource WD.WindowCloseGeometry}"
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
Fill="{DynamicResource WD.WindowTextBrush}"
Stretch="Uniform" />
</Button>
</StackPanel>
Expand Down Expand Up @@ -183,7 +182,7 @@
Margin="6,0"
VerticalAlignment="Center"
FontSize="{DynamicResource WD.TitleFontSize}"
Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
Foreground="{DynamicResource WD.WindowTextBrush}"
Text="{TemplateBinding Title}" />
<StackPanel
Grid.Column="2"
Expand All @@ -205,7 +204,7 @@
Height="1"
Margin="0,7,0,0"
VerticalAlignment="Bottom"
Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
Fill="{DynamicResource WD.WindowTextBrush}" />
</Grid>
</Button>
<Button
Expand All @@ -222,7 +221,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource WD.WindowMaximizeGeometry}"
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
Fill="{DynamicResource WD.WindowTextBrush}"
Stretch="Uniform"
UseLayoutRounding="False" />
</Grid>
Expand All @@ -242,7 +241,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource WD.WindowRestoreGeometry}"
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
Fill="{DynamicResource WD.WindowTextBrush}"
Stretch="Uniform"
UseLayoutRounding="False" />
</Grid>
Expand All @@ -261,7 +260,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{DynamicResource WD.WindowCloseGeometry}"
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
Fill="{DynamicResource WD.WindowTextBrush}"
Stretch="Uniform" />
</Button>
</StackPanel>
Expand Down Expand Up @@ -305,7 +304,6 @@
<Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
<Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
</Trigger>

<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
Expand Down
Loading