Skip to content

Commit

Permalink
Bump version (#1331)
Browse files Browse the repository at this point in the history
  • Loading branch information
pomianowski authored Feb 1, 2025
1 parent fc346b5 commit bb560af
Show file tree
Hide file tree
Showing 24 changed files with 1,304 additions and 85 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<PropertyGroup>
<Version>4.0.0-rc.3</Version>
<Version>4.0.0</Version>
<AssemblyVersion>4.0.0</AssemblyVersion>
</PropertyGroup>

Expand All @@ -17,7 +17,7 @@
<CommonTags>lepoco;toolkit;wpf;fluent;navigation;controls;design;icons;system;accent;theme;winui</CommonTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Copyright (C) 2021-2024 Leszek Pomianowski and WPF UI Contributors</Copyright>
<Copyright>Copyright (C) 2021-2025 Leszek Pomianowski and WPF UI Contributors</Copyright>
<PackageProjectUrl>https://github.com/lepoco/wpfui</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/lepoco/wpfui/releases</PackageReleaseNotes>
<PackageIcon>Icon.png</PackageIcon>
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2024 Leszek Pomianowski and WPF UI Contributors. https://lepo.co/
Copyright (c) 2021-2025 Leszek Pomianowski and WPF UI Contributors. https://lepo.co/

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2024 Leszek Pomianowski and WPF UI Contributors. https://lepo.co/
Copyright (c) 2021-2025 Leszek Pomianowski and WPF UI Contributors. https://lepo.co/

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion docs/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"_appName": "WPF UI",
"_appFaviconPath": "images/favicon.ico",
"_appLogoPath": "images/wpfui.png",
"_appFooter": "<span>Made with <a href=\"https://dotnet.github.io/docfx\" rel=\"noreferrer\">docfx</a>, <a href=\"https://chat.openai.com/\" rel=\"noreferrer\">ChatGPT</a> and <a href=\"https://www.deepl.com/\" rel=\"noreferrer\">DeepL</a> | Copyright © 2024 <a href=\"https://lepo.co/\">lepo.co</a></span>"
"_appFooter": "<span>Made with <a href=\"https://dotnet.github.io/docfx\" rel=\"noreferrer\">docfx</a>, <a href=\"https://chat.openai.com/\" rel=\"noreferrer\">ChatGPT</a> and <a href=\"https://www.deepl.com/\" rel=\"noreferrer\">DeepL</a> | Copyright © 2025 <a href=\"https://lepo.co/\">lepo.co</a></span>"
},
"dest": "_site",
"template": [
Expand Down
2 changes: 1 addition & 1 deletion docs/templates/wpfui/layout/_master.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

<footer class="border-top">
<div class="container-xxl">
<div class="row"><div class="col-12">WPF UI<a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/lepoco/wpfui"><code> https://github.com/lepoco/wpfui </code></a></div><div class="col-12">Build with<a target="_blank" rel="noopener nofollow noreferrer" href="https://dotnet.github.io/docfx/"><code> docfx </code></a>using <a target="_blank" rel="noopener nofollow noreferrer" href="https://www.deepl.com/en/translator"><code> deepl</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://highlightjs.org/"><code> highlight.js</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://getbootstrap.com/"><code> bootstrap</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/microsoft/fluentui-system-icons"><code> fluent-system-icons</code></a></div><div class="col-12">Copyright © 2024 lepo.co | Leszek Pomianowski</div></div>
<div class="row"><div class="col-12">WPF UI<a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/lepoco/wpfui"><code> https://github.com/lepoco/wpfui </code></a></div><div class="col-12">Build with<a target="_blank" rel="noopener nofollow noreferrer" href="https://dotnet.github.io/docfx/"><code> docfx </code></a>using <a target="_blank" rel="noopener nofollow noreferrer" href="https://www.deepl.com/en/translator"><code> deepl</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://highlightjs.org/"><code> highlight.js</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://getbootstrap.com/"><code> bootstrap</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/microsoft/fluentui-system-icons"><code> fluent-system-icons</code></a></div><div class="col-12">Copyright © 2025 lepo.co | Leszek Pomianowski and Open-Source Contributors</div></div>
</div>
</footer>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.Extension/license.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2024 Leszek Pomianowski and WPF UI Contributors. https://lepo.co/
Copyright (c) 2021-2025 Leszek Pomianowski and WPF UI Contributors. https://lepo.co/

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.Gallery.Package/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity
Name="RapidDev.WPFUI"
Publisher="CN=F7CE81D0-29F4-45AA-935D-9F9E73C50210"
Version="3.0.3.0" />
Version="4.0.0.0" />

<Properties>
<DisplayName>WPF UI</DisplayName>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.Gallery/Effects/Snowflake.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ public TranslateTransform? Transform
get => _transform;
set => _transform = value;
}
}
}
29 changes: 16 additions & 13 deletions src/Wpf.Ui.Gallery/Effects/SnowflakeEffect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ namespace Wpf.Ui.Gallery.Effects;
/// </summary>
internal class SnowflakeEffect
{
private readonly Canvas _canvas; // Canvas for displaying snowflakes
private readonly Random _random = new(); // Random number generator
private readonly List<SnowFlake> _snowFlakes = []; // Stores all snowflake objects
private readonly int _flakeCount; // Number of snowflakes
private double mX = -100; // Mouse X-coordinate, default value -100
private double mY = -100; // Mouse Y-coordinate, default value -100
private readonly Canvas _canvas; // Canvas for displaying snowflakes
private readonly Random _random = new(); // Random number generator
private readonly List<SnowFlake> _snowFlakes = []; // Stores all snowflake objects
private readonly int _flakeCount; // Number of snowflakes
private double mX = -100; // Mouse X-coordinate, default value -100
private double mY = -100; // Mouse Y-coordinate, default value -100

/// <summary>
/// Initializes a new instance of the <see cref="SnowflakeEffect"/> class.
Expand Down Expand Up @@ -79,17 +79,17 @@ private void InitSnowFlakes()
/// </summary>
private void CreateSnowFlake()
{
double size = (_random.NextDouble() * 3) + 2; // Snowflake size
double speed = (_random.NextDouble() * 1) + 0.5; // Falling speed
double opacity = (_random.NextDouble() * 0.5) + 0.3; // Opacity
double x = _random.NextDouble() * _canvas.ActualWidth; // Initial X position
double size = (_random.NextDouble() * 3) + 2; // Snowflake size
double speed = (_random.NextDouble() * 1) + 0.5; // Falling speed
double opacity = (_random.NextDouble() * 0.5) + 0.3; // Opacity
double x = _random.NextDouble() * _canvas.ActualWidth; // Initial X position
double y = _random.NextDouble() * _canvas.ActualHeight; // Initial Y position

Ellipse flakeShape = new()
{
Width = size,
Height = size,
Fill = new SolidColorBrush(Color.FromArgb((byte)(opacity * 255), 255, 255, 255))
Fill = new SolidColorBrush(Color.FromArgb((byte)(opacity * 255), 255, 255, 255)),
};

TranslateTransform transform = new(x, y);
Expand All @@ -110,7 +110,7 @@ private void CreateSnowFlake()
StepSize = _random.NextDouble() / 30 * 1,
Step = 0,
Angle = 180,
Transform = transform
Transform = transform,
};

_snowFlakes.Add(flake);
Expand Down Expand Up @@ -195,7 +195,10 @@ private void ResetFlake(SnowFlake flake)

flake.Shape.SetCurrentValue(FrameworkElement.WidthProperty, flake.Size);
flake.Shape.SetCurrentValue(FrameworkElement.HeightProperty, flake.Size);
flake.Shape.SetCurrentValue(Shape.FillProperty, new SolidColorBrush(Color.FromArgb((byte)(flake.Opacity * 255), 255, 255, 255)));
flake.Shape.SetCurrentValue(
Shape.FillProperty,
new SolidColorBrush(Color.FromArgb((byte)(flake.Opacity * 255), 255, 255, 255))
);
}

/// <summary>
Expand Down
15 changes: 9 additions & 6 deletions src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public BasicInputPage(BasicInputViewModel viewModel, INavigationService navigati
private void HandleLoaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Collapsed);
}
Expand All @@ -45,8 +47,7 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
MainTitle.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, newTitle);
}

if (selectedItem.Icon is SymbolIcon selectedIcon &&
MainSymbolIcon.Symbol != selectedIcon.Symbol)
if (selectedItem.Icon is SymbolIcon selectedIcon && MainSymbolIcon.Symbol != selectedIcon.Symbol)
{
MainSymbolIcon.SetCurrentValue(SymbolIcon.SymbolProperty, selectedIcon.Symbol);
}
Expand All @@ -59,8 +60,10 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
private void HandleUnloaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Visible)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Visible
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Visible);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public CollectionsPage(CollectionsViewModel viewModel, INavigationService naviga
private void HandleLoaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Collapsed);
}
Expand All @@ -45,8 +47,7 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
MainTitle.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, newTitle);
}

if (selectedItem.Icon is SymbolIcon selectedIcon &&
MainSymbolIcon.Symbol != selectedIcon.Symbol)
if (selectedItem.Icon is SymbolIcon selectedIcon && MainSymbolIcon.Symbol != selectedIcon.Symbol)
{
MainSymbolIcon.SetCurrentValue(SymbolIcon.SymbolProperty, selectedIcon.Symbol);
}
Expand All @@ -59,8 +60,10 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
private void HandleUnloaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Visible)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Visible
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Visible);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public DateAndTimePage(DateAndTimeViewModel viewModel, INavigationService naviga
private void HandleLoaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Collapsed);
}
Expand All @@ -45,8 +47,7 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
MainTitle.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, newTitle);
}

if (selectedItem.Icon is SymbolIcon selectedIcon &&
MainSymbolIcon.Symbol != selectedIcon.Symbol)
if (selectedItem.Icon is SymbolIcon selectedIcon && MainSymbolIcon.Symbol != selectedIcon.Symbol)
{
MainSymbolIcon.SetCurrentValue(SymbolIcon.SymbolProperty, selectedIcon.Symbol);
}
Expand All @@ -59,8 +60,10 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
private void HandleUnloaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Visible)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Visible
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Visible);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public DialogsAndFlyoutsPage(DialogsAndFlyoutsViewModel viewModel, INavigationSe
private void HandleLoaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Collapsed);
}
Expand All @@ -45,8 +47,7 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
MainTitle.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, newTitle);
}

if (selectedItem.Icon is SymbolIcon selectedIcon &&
MainSymbolIcon.Symbol != selectedIcon.Symbol)
if (selectedItem.Icon is SymbolIcon selectedIcon && MainSymbolIcon.Symbol != selectedIcon.Symbol)
{
MainSymbolIcon.SetCurrentValue(SymbolIcon.SymbolProperty, selectedIcon.Symbol);
}
Expand All @@ -59,8 +60,10 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
private void HandleUnloaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Visible)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Visible
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Visible);
}
Expand Down
15 changes: 9 additions & 6 deletions src/Wpf.Ui.Gallery/Views/Pages/Layout/LayoutPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public LayoutPage(LayoutViewModel viewModel, INavigationService navigationServic
private void HandleLoaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Collapsed);
}
Expand All @@ -45,8 +47,7 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
MainTitle.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, newTitle);
}

if (selectedItem.Icon is SymbolIcon selectedIcon &&
MainSymbolIcon.Symbol != selectedIcon.Symbol)
if (selectedItem.Icon is SymbolIcon selectedIcon && MainSymbolIcon.Symbol != selectedIcon.Symbol)
{
MainSymbolIcon.SetCurrentValue(SymbolIcon.SymbolProperty, selectedIcon.Symbol);
}
Expand All @@ -59,8 +60,10 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
private void HandleUnloaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Visible)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Visible
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Visible);
}
Expand Down
15 changes: 9 additions & 6 deletions src/Wpf.Ui.Gallery/Views/Pages/Media/MediaPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public MediaPage(MediaViewModel viewModel, INavigationService navigationService)
private void HandleLoaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Collapsed
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Collapsed);
}
Expand All @@ -45,8 +47,7 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
MainTitle.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, newTitle);
}

if (selectedItem.Icon is SymbolIcon selectedIcon &&
MainSymbolIcon.Symbol != selectedIcon.Symbol)
if (selectedItem.Icon is SymbolIcon selectedIcon && MainSymbolIcon.Symbol != selectedIcon.Symbol)
{
MainSymbolIcon.SetCurrentValue(SymbolIcon.SymbolProperty, selectedIcon.Symbol);
}
Expand All @@ -59,8 +60,10 @@ private void HandleLoaded(object sender, RoutedEventArgs e)
private void HandleUnloaded(object sender, RoutedEventArgs e)
{
INavigationView? navigationControl = _navigationService.GetNavigationControl();
if (navigationControl?.BreadcrumbBar != null &&
navigationControl.BreadcrumbBar.Visibility != Visibility.Visible)
if (
navigationControl?.BreadcrumbBar != null
&& navigationControl.BreadcrumbBar.Visibility != Visibility.Visible
)
{
navigationControl.BreadcrumbBar.SetCurrentValue(VisibilityProperty, Visibility.Visible);
}
Expand Down
Loading

0 comments on commit bb560af

Please sign in to comment.