Skip to content

Commit

Permalink
chore: Update version (3.0.0/3.0.0.15100)
Browse files Browse the repository at this point in the history
  • Loading branch information
nishy2000 committed Mar 10, 2021
1 parent 3cefcc6 commit d503857
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 96 deletions.
25 changes: 10 additions & 15 deletions samples/MetroRadiance.Showcase/MetroRadiance.Showcase.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<TargetFrameworks>net452;net462;netcoreapp3.1</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyVersion>3.0.0.13270</AssemblyVersion>
<FileVersion>3.0.0.13270</FileVersion>
<AssemblyVersion>3.0.0.15100</AssemblyVersion>
<FileVersion>3.0.0.15100</FileVersion>

<Version>3.0.0-alpha04</Version>
<Version>3.0.0</Version>
<Company>nishy software</Company>
<Authors>nishy software</Authors>
<PackageTags>WPF Theme Dark Light Managed C# Metro Radiance MetroRadiance</PackageTags>
Expand All @@ -19,20 +19,15 @@
<PackageId>MetroRadiance.Fork.Showcase</PackageId>
<PackageReleaseNotes>
Changes
- [alpha00]Support .NET Core 3.1 (WPF)
- [alpha01]Add UWP compatible resource samples to the theme brush sample page
- [alpha01]Add UI controls for adjusting themes to the control sample page
- [alpha01]Localize the text string (English/Japanese)
- [alpha02]Add Chrome.Externals sample
- [alpha02]Add Number validation rule sample
- [alpha03]Add MenuItem sample
- [alpha04]Fix an issue that failed when creating metro:BlurWindow and metro:AcrylicBlurWindow in UI Window sample
- [alpha04]Add ContextMenu sample
- [alpha04]Add GroupBox sample
- [alpha05]Add ComboBox sample
- Support .NET Core 3.1 (WPF)
- Localize the text string (English/Japanese)
- Add UWP compatible resource samples to the theme brush sample page
- Add UI controls for adjusting themes to the control sample page
- Add ComboBox / ContextMenu /GroupBox / MenuItem / Number validation rule samples in the control sample page
- Add Chrome.Externals sample in the External Window Chrome sample page

Limitations
- [alpha01-] When moving windows using metro:AcrylicBlurWindow, the move process is very slow on Windows 10 1903 (Build 18362, May 2019 Update) or later
- When moving windows using metro:AcrylicBlurWindow, the move process is very slow on Windows 10 1903 (Build 18362, May 2019 Update) or later
</PackageReleaseNotes>
<OutputType>WinExe</OutputType>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<TargetFrameworks>net45</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyVersion>3.0.0.12200</AssemblyVersion>
<FileVersion>3.0.0.12200</FileVersion>
<AssemblyVersion>3.0.0.15100</AssemblyVersion>
<FileVersion>3.0.0.15100</FileVersion>
<RootNamespace>MetroRadiance</RootNamespace>
<Version>3.0.0-alpha03</Version>
<Version>3.0.0</Version>
<Company>nishy software</Company>
<Authors>nishy software</Authors>
<PackageTags>WPF Theme Dark Light Managed C# Metro Radiance MetroRadiance</PackageTags>
Expand All @@ -15,15 +15,15 @@
<PackageProjectUrl>https://github.com/nishy2000/MetroRadiance.Fork</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Description>Modern WPF Themes (chrome for external window). Fork of MetroRadiance</Description>
<Copyright>©2020 nishy software / ©2014-2017 Manato KAMEYA</Copyright>
<Copyright>©2020, 2021 nishy software / ©2014-2017 Manato KAMEYA</Copyright>
<PackageId>MetroRadiance.Fork.Chrome.Externals</PackageId>
<PackageReleaseNotes>
Changes
- [alpha02]Update the development tool to Visual Studio 2019
- [alpha02]Change TargetPlatform from .NET framework 4.6 to .NET framework 4.5
- [alpha02]Support High DPI enviroment
- [alpha02]Fix misalignment issues of some parts
- [alpha03][internal change]Update the formatting of source code
- Update the development tool to Visual Studio 2019
- Change TargetPlatform from .NET framework 4.6 to .NET framework 4.5
- Support High DPI enviroment
- Fix misalignment issues of some parts
- [internal change]Update the formatting of source code
</PackageReleaseNotes>
</PropertyGroup>

Expand Down
16 changes: 8 additions & 8 deletions source/MetroRadiance.Chrome/MetroRadiance.Chrome.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyVersion>3.0.0.12200</AssemblyVersion>
<FileVersion>3.0.0.12200</FileVersion>
<AssemblyVersion>3.0.0.15100</AssemblyVersion>
<FileVersion>3.0.0.15100</FileVersion>
<RootNamespace>MetroRadiance</RootNamespace>
<Version>3.0.0-alpha03</Version>
<Version>3.0.0</Version>
<Company>nishy software</Company>
<Authors>nishy software</Authors>
<PackageTags>WPF Theme Dark Light Managed C# Metro Radiance MetroRadiance</PackageTags>
Expand All @@ -15,14 +15,14 @@
<PackageProjectUrl>https://github.com/nishy2000/MetroRadiance.Fork</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Description>Modern WPF Themes (chrome). Fork of MetroRadiance</Description>
<Copyright>©2020 nishy software / ©2014-2017 Manato KAMEYA</Copyright>
<Copyright>©2020, 2021 nishy software / ©2014-2017 Manato KAMEYA</Copyright>
<PackageId>MetroRadiance.Fork.Chrome</PackageId>
<PackageReleaseNotes>
Changes
- [alpha00]Support .NET Core 3.1 (WPF)
- [alpha02]Adjust for High DPI enviroment
- [alpha02]Fix misalignment issues of some parts
- [alpha03][internal change]Update the formatting of source code
- Support .NET Core 3.1 (WPF)
- Adjust for High DPI enviroment
- Fix misalignment issues of some parts
- [internal change]Update the formatting of source code
</PackageReleaseNotes>
</PropertyGroup>

Expand Down
21 changes: 11 additions & 10 deletions source/MetroRadiance.Core/MetroRadiance.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<TargetFrameworks>net45;net462;netcoreapp3.1</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyVersion>3.0.0.12200</AssemblyVersion>
<FileVersion>3.0.0.12200</FileVersion>
<AssemblyVersion>3.0.0.15100</AssemblyVersion>
<FileVersion>3.0.0.15100</FileVersion>
<RootNamespace>MetroRadiance</RootNamespace>
<Version>3.0.0-alpha03</Version>
<Version>3.0.0</Version>
<Company>nishy software</Company>
<Authors>nishy software</Authors>
<PackageTags>WPF Theme Dark Light Managed C# Metro Radiance MetroRadiance</PackageTags>
Expand All @@ -15,17 +15,18 @@
<PackageProjectUrl>https://github.com/nishy2000/MetroRadiance.Fork</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Description>Modern WPF Themes (core). Fork of MetroRadiance</Description>
<Copyright>©2020 nishy software / ©2014-2017 Manato KAMEYA</Copyright>
<Copyright>©2020, 2021 nishy software / ©2014-2017 Manato KAMEYA</Copyright>
<PackageId>MetroRadiance.Fork.Core</PackageId>
<PackageReleaseNotes>
Changes
- [alpha00]Support .NET Core 3.1 (WPF)
- [alpha01]Add HslColor class for HSL color model
- [alpha01]Add text scale factor support.
- [alpha02]Improve interop methods
- [alpha03]Add new DPIHelper class for DPI / Per-Monitor DPI support
- Support .NET Core 3.1 (WPF)
- Add HslColor class for HSL color model
- Add text scale factor support.
- Improve interop methods
- Add new DPIHelper class for DPI / Per-Monitor DPI support

Breaking changes
- [alpha01]The type of properties in the MetroRadiance.Platform.WindowsTheme class has changed. Affected if the received variable declaration is used an explicitly specified type instead of using "var".
- The type of properties in the MetroRadiance.Platform.WindowsTheme class has changed. Affected if the received variable declaration is used an explicitly specified type instead of using "var".
</PackageReleaseNotes>
</PropertyGroup>

Expand Down
42 changes: 18 additions & 24 deletions source/MetroRadiance/MetroRadiance.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<TargetFrameworks>net45;net462;netcoreapp3.1</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyVersion>3.0.0.13270</AssemblyVersion>
<FileVersion>3.0.0.13270</FileVersion>
<AssemblyVersion>3.0.0.15100</AssemblyVersion>
<FileVersion>3.0.0.15100</FileVersion>
<RootNamespace>MetroRadiance</RootNamespace>
<Version>3.0.0-alpha04</Version>
<Version>3.0.0</Version>
<Company>nishy software</Company>
<Authors>nishy software</Authors>
<PackageTags>WPF Theme Dark Light Managed C# Metro Radiance MetroRadiance</PackageTags>
Expand All @@ -19,29 +19,23 @@
<PackageId>MetroRadiance.Fork</PackageId>
<PackageReleaseNotes>
Changes
- [alpha00]Support .NET Core 3.1 (WPF)
- [alpha01]Add Add UWP compatible resources (colors/brushes)
- [alpha01]Apply dark theme to the system menu
- [alpha01]Add AcrylicBlurWindow class
- [alpha01]Improve CaptionIcon behavior to work with Window.
- [alpha01]Add toottip text to Caption buttons (Minimize/Maximize/Restore/Close).
- [alpha01]Adjust the foreground color of the tooltip control
- [alpha01]Localize the text string used in the Int32Rule class (en/ja/de/fr/ko/zh-Hans/zh-Hant)
- [alpha02]Fix an issue where brush values would not update as the theme changed after the control was reloaded
- [alpha02]Improve the appearance of radio button
- [alpha02]Add standard control styles (Label/TextBox)
- [alpha02]Add number validation rules (Int16Rule/UInt16Rule/Int32Rule/UInt32Rule/SingleRule/DoubleRule)
- [alpha03]Add standard menu styles (Menu/MenuItem/ContextMenu)
- [alpha04]Fix an issue that failed when initializing BlurWindow and AcrylicBlurWindow
- [alpha04]Fix an issue that background of context menu style is not appropriate
- [alpha04]Fix an issue where the appearance of the check state is clipped in Menu/ContextMenu
- [alpha04]Adjust the appearance of the selected state in Menu/ContextMenu
- [alpha04]Add a style key for each style defined by MetroRadiance
- [alpha04]Add standard control styles (GroupBox)
- [alpha05]Add standard control styles (ComboBox)
- Support .NET Core 3.1 (WPF)
- Add UWP compatible resources (colors/brushes)
- Add AcrylicBlurWindow class
- Add a style key for each style defined by MetroRadiance
- Add standard control styles (ComboBox/GroupBox/Label/TextBox)
- Add standard menu styles (Menu/MenuItem/ContextMenu)
- Add number validation rules (Int16Rule/UInt16Rule/Int32Rule/UInt32Rule/SingleRule/DoubleRule)
- Add toottip text to Caption buttons (Minimize/Maximize/Restore/Close).
- Localize the text string used in the Int32Rule class (en/ja/de/fr/ko/zh-Hans/zh-Hant)
- Apply dark theme to the system menu
- Improve CaptionIcon behavior to work with Window.
- Improve the appearance of radio button
- Adjust the foreground color of the tooltip control
- Fix an issue where brush values would not update as the theme changed after the control was reloaded

Limitations
- [alpha01-] When moving windows using AcrylicBlurWindow class, the move process is very slow on Windows 10 1903 (Build 18362, May 2019 Update) or later
- When moving windows using AcrylicBlurWindow class, the move process is very slow on Windows 10 1903 (Build 18362, May 2019 Update) or later
</PackageReleaseNotes>
<Configurations>Debug;Release;Release RETRO</Configurations>
</PropertyGroup>
Expand Down
60 changes: 30 additions & 30 deletions source/MetroRadiance/Themes/Generic.Badge.xaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:MetroRadiance.UI.Controls">

<Style TargetType="{x:Type controls:Badge}">
<Setter Property="Width"
Value="22" />
<Setter Property="Height"
Value="22" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:Badge}">
<Grid>
<Border CornerRadius="100"
Background="{DynamicResource AccentHighlightBrushKey}"
BorderThickness="0"
BorderBrush="{DynamicResource AccentHighlightBrushKey}">
</Border>
<TextBlock x:Name="PART_CountHost"
FontSize="11"
FontFamily="Segoe UI"
Foreground="{DynamicResource AccentForegroundBrushKey}"
VerticalAlignment="Center"
HorizontalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:MetroRadiance.UI.Controls">

<Style TargetType="{x:Type controls:Badge}">
<Setter Property="Width"
Value="22" />
<Setter Property="Height"
Value="22" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:Badge}">
<Grid>
<Border CornerRadius="100"
Background="{DynamicResource AccentHighlightBrushKey}"
BorderThickness="0"
BorderBrush="{DynamicResource AccentHighlightBrushKey}">
</Border>
<TextBlock x:Name="PART_CountHost"
FontSize="11"
FontFamily="Segoe UI"
Foreground="{DynamicResource AccentForegroundBrushKey}"
VerticalAlignment="Center"
HorizontalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

</ResourceDictionary>

0 comments on commit d503857

Please sign in to comment.