Skip to content

master pull request dev #97

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 18 commits into from
May 27, 2024
Merged

master pull request dev #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9315160
Update README-zh.md
yanjinhuagood Sep 1, 2023
67052d1
Merge pull request #65 from WPFDevelopersOrg/dev
yanjinhuagood Sep 1, 2023
c84d531
Update README.md
yanjinhuagood Oct 16, 2023
703be46
Update README-zh.md
yanjinhuagood Oct 16, 2023
6f2a1fb
Merge pull request #75 from WPFDevelopersOrg/dev
yanjinhuagood Dec 11, 2023
31eec61
Update README.md
yanjinhuagood Dec 17, 2023
1da07cc
Update README-zh.md
yanjinhuagood Dec 17, 2023
006c31e
Merge pull request #83 from WPFDevelopersOrg/dev
yanjinhuagood Jan 13, 2024
3a4dd58
Update README.md
yanjinhuagood Jan 14, 2024
e793fd2
Update README.md
yanjinhuagood Jan 28, 2024
563a422
Update README.md
yanjinhuagood Jan 28, 2024
afebc17
Update README-zh.md
yanjinhuagood Jan 28, 2024
0716b00
Update README.md
yanjinhuagood Jan 28, 2024
734aacd
Merge pull request #90 from WPFDevelopersOrg/dev
yanjinhuagood Feb 20, 2024
ad652ce
Merge pull request #92 from WPFDevelopersOrg/dev
yanjinhuagood Feb 21, 2024
58f7724
Merge pull request #95 from WPFDevelopersOrg/dev
yanjinhuagood May 27, 2024
2ee5e36
Revert "dev pull request master"
yanjinhuagood May 27, 2024
c835294
Merge pull request #96 from WPFDevelopersOrg/revert-95-dev
yanjinhuagood May 27, 2024
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: 23 additions & 1 deletion README-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

### [ Wiki→ 正在进行快速更新](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/wikis/pages)

### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star</kbd>。
### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star🌟</kbd>。

### 运行环境 Visual Studio 2022

Expand All @@ -40,6 +40,8 @@
| netcoreapp3.0 | ✅ |
| net5.0-windows | ✅ |
| net6.0-windows | ✅ |
| net7.0-windows | ✅ |
| net8.0-windows | ✅ |

### 欢迎关注微信公众号

Expand Down Expand Up @@ -89,6 +91,26 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`

***
### IPEditBox

<img src="hhttps://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/IPEditBox.gif"/>

----------
### TransformLayout

<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TransformLayout.gif"/>

----------
### ScreenCaptureExt

<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ScreenCutNew.gif"/>

----------
### TimePicker

<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TimePicker.gif"/>

----------
### ColorPicker

<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ColorPicker.gif"/>
Expand Down
22 changes: 22 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
| netcoreapp3.0 | ✅ |
| net5.0-windows | ✅ |
| net6.0-windows | ✅ |
| net7.0-windows | ✅ |
| net8.0-windows | ✅ |

### Donate
If you think our open source software is helpful to you, please scan the QR code below and give us a cup of coffee.
Expand Down Expand Up @@ -79,6 +81,26 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"

`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`

----------
### IPEditBox

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/IPEditBox.gif"/>

----------
### TransformLayout

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TransformLayout.gif"/>

----------
### ScreenCaptureExt

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ScreenCutNew.gif"/>

----------
### TimePicker

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TimePicker.gif"/>

----------
### ColorPicker

Expand Down
11 changes: 3 additions & 8 deletions src/WPFDevelopers.Net40/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:control="clr-namespace:WPFDevelopers.Controls"
xmlns:converts="clr-namespace:WPFDevelopers.Converts"
xmlns:resx="clr-namespace:WPFDevelopers"
xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
Expand Down Expand Up @@ -75,8 +74,7 @@
Padding="0"
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
Style="{DynamicResource WD.WindowButtonStyle}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Rectangle
x:Name="MinimizeGlyph"
Expand All @@ -92,8 +90,7 @@
Padding="0"
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
Style="{DynamicResource WD.WindowButtonStyle}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path
Width="10"
Expand All @@ -112,7 +109,6 @@
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
Visibility="Collapsed">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path
Expand All @@ -132,8 +128,7 @@
Name="PART_CloseButton"
Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
Style="{DynamicResource WD.WindowButtonStyle}">
<Path
Width="10"
Height="10"
Expand Down
Loading