Skip to content

Revert "dev pull request master" #96

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 1 commit into from
May 27, 2024
Merged

Revert "dev pull request master" #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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
469 changes: 244 additions & 225 deletions src/WPFDevelopers.Net40/Themes/Theme.xaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Import Project="../Package.props" />
<Import Project="../Package.props"/>
<PropertyGroup>
<TargetFramework>net40</TargetFramework>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
Expand Down
11 changes: 3 additions & 8 deletions src/WPFDevelopers.Net45x/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:wd="clr-namespace:WPFDevelopers.Net45x">
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
<Style
Expand Down Expand Up @@ -81,8 +80,7 @@
Padding="0"
Command="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 @@ -98,8 +96,7 @@
Padding="0"
Command="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 @@ -118,7 +115,6 @@
Command="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 @@ -138,8 +134,7 @@
Name="PART_CloseButton"
Command="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