From 794979d0ead4c18bca7f3ec120e134796cc5951a Mon Sep 17 00:00:00 2001 From: Jan Bryknar Date: Mon, 16 Jun 2025 14:03:56 +0200 Subject: [PATCH 01/68] fix: MenuItem hover animation disappears after click (#1451) --- .../Views/Pages/Navigation/MenuPage.xaml | 67 ++++-- src/Wpf.Ui/Controls/Menu/MenuItem.xaml | 190 +++++++++++++++--- src/Wpf.Ui/Resources/Theme/Dark.xaml | 4 +- src/Wpf.Ui/Resources/Theme/HC1.xaml | 8 +- src/Wpf.Ui/Resources/Theme/HC2.xaml | 8 +- src/Wpf.Ui/Resources/Theme/HCBlack.xaml | 8 +- src/Wpf.Ui/Resources/Theme/HCWhite.xaml | 8 +- src/Wpf.Ui/Resources/Theme/Light.xaml | 4 +- 8 files changed, 232 insertions(+), 65 deletions(-) diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml index b8f034456..44743a9c0 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml @@ -21,36 +21,61 @@ - <Menu>\n - \t<MenuItem Header="File" />\n - \t<MenuItem Header="Edit" />\n - \t<ui:MenuItem Header="Icon" SymbolIcon="Fluent24" />\n - \t<ui:MenuItem SymbolIcon="Fluent24" />\n + <Menu FontSize="14">\n + \t\t\t<ui:MenuItem Header="File" Icon="{ui:SymbolIcon Symbol=Document24}">\n + \t\t\t\t\t\t<ui:MenuItem Header="New" InputGestureText="CTRL+N" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Open..." InputGestureText="CTRL+O" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Save" InputGestureText="CTRL+S" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Save As..." InputGestureText="CTRL+SHIFT+S" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Exit" />\n + \t\t\t</ui:MenuItem>\n + \t\t\t<ui:MenuItem Header="Edit" Icon="{ui:SymbolIcon DocumentEdit20}">\n + \t\t\t\t\t\t<ui:MenuItem Header="Undo" InputGestureText="CTRL+Z" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Cut" InputGestureText="CTRL+X" />\n + \t\t\t\t\t\t <ui:MenuItem Header="Copy" InputGestureText="CTRL+C" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Paste" InputGestureText="CTRL+V" />\n + \t\t\t\t\t\t<ui:MenuItem IsEnabled="False" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Word wrap" InputGestureText="CTRL+SHIFT+W" IsCheckable="True"IsChecked="True" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Find..." InputGestureText="CTRL+F" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Find next" InputGestureText="F3" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Select All" InputGestureText="CTRL+A" />\n + \t\t\t</ui:MenuItem>\n + \t\t\t<Separator />\n + \t\t\t<ui:MenuItem Icon="{ui:SymbolIcon TextBold20}" />\n + \t\t\t<ui:MenuItem Icon="{ui:SymbolIcon TextItalic20}" />\n + \t\t\t<ui:MenuItem Icon="{ui:SymbolIcon TextUnderline20}" />\n </Menu> - - - - - - + + + + + - + - + - - - - + + + + - - - + + + - + diff --git a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml index 61a176453..8b770dfc7 100644 --- a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml +++ b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml @@ -68,7 +68,7 @@ VerticalAlignment="Center" Content="{TemplateBinding Icon}" /> + + + + + + + + + + + + + + + + - + @@ -175,7 +191,7 @@ Content="{TemplateBinding Icon}" KeyboardNavigation.IsTabStop="False" /> + + + + + + + + + + + + + + + + - + @@ -218,7 +250,6 @@ - + + + + + + + + + + + + + + + + + @@ -287,7 +336,7 @@ - + @@ -321,7 +370,7 @@ KeyboardNavigation.IsTabStop="False" /> @@ -382,6 +431,22 @@ + + + + + + + + + + + + + + + + - + + + diff --git a/src/Wpf.Ui/Resources/Theme/HC1.xaml b/src/Wpf.Ui/Resources/Theme/HC1.xaml index 06493c04f..7fa258835 100644 --- a/src/Wpf.Ui/Resources/Theme/HC1.xaml +++ b/src/Wpf.Ui/Resources/Theme/HC1.xaml @@ -391,9 +391,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/HC2.xaml b/src/Wpf.Ui/Resources/Theme/HC2.xaml index dd9bf09bb..4710ee461 100644 --- a/src/Wpf.Ui/Resources/Theme/HC2.xaml +++ b/src/Wpf.Ui/Resources/Theme/HC2.xaml @@ -390,9 +390,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/HCBlack.xaml b/src/Wpf.Ui/Resources/Theme/HCBlack.xaml index f1c98689e..27ac80fb6 100644 --- a/src/Wpf.Ui/Resources/Theme/HCBlack.xaml +++ b/src/Wpf.Ui/Resources/Theme/HCBlack.xaml @@ -390,9 +390,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/HCWhite.xaml b/src/Wpf.Ui/Resources/Theme/HCWhite.xaml index 60ef60dd7..c18c05062 100644 --- a/src/Wpf.Ui/Resources/Theme/HCWhite.xaml +++ b/src/Wpf.Ui/Resources/Theme/HCWhite.xaml @@ -390,9 +390,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/Light.xaml b/src/Wpf.Ui/Resources/Theme/Light.xaml index 6a087f540..106a5ea3a 100644 --- a/src/Wpf.Ui/Resources/Theme/Light.xaml +++ b/src/Wpf.Ui/Resources/Theme/Light.xaml @@ -508,8 +508,10 @@ - + + + From 34c5392d4215def0f1faa5a042d96b6bb4ac8433 Mon Sep 17 00:00:00 2001 From: Jan Bryknar Date: Mon, 16 Jun 2025 14:05:02 +0200 Subject: [PATCH 02/68] fix: CalendarDatePicker icon disappears when multiple instances are used (#1452) Co-authored-by: pomian <13592821+pomianowski@users.noreply.github.com> --- .../CalendarDatePicker/CalendarDatePicker.xaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml b/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml index bf23e745b..90bcd6dd3 100644 --- a/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml +++ b/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml @@ -17,17 +17,17 @@ + + - + @@ -232,7 +232,7 @@ - + From d1ba15c19758f4980467b3da44da385919e5a910 Mon Sep 17 00:00:00 2001 From: Nuklon Date: Sat, 25 Oct 2025 20:31:36 +0200 Subject: [PATCH 06/68] fix: Check DwmIsCompositionEnabled result (#1548) --- src/Wpf.Ui/Win32/Utilities.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Wpf.Ui/Win32/Utilities.cs b/src/Wpf.Ui/Win32/Utilities.cs index 97e32c27f..b2eeeea68 100644 --- a/src/Wpf.Ui/Win32/Utilities.cs +++ b/src/Wpf.Ui/Win32/Utilities.cs @@ -86,9 +86,7 @@ public static bool IsCompositionEnabled return false; } - _ = Interop.Dwmapi.DwmIsCompositionEnabled(out var pfEnabled); - - return pfEnabled != 0; + return Interop.Dwmapi.DwmIsCompositionEnabled(out var pfEnabled) == 0 && pfEnabled != 0; } } From 4ff47433527c0ffb7b20207f503a349cb5928925 Mon Sep 17 00:00:00 2001 From: DAVID FERNANDO LEGENDRE ALBITES Date: Sat, 25 Oct 2025 13:33:21 -0500 Subject: [PATCH 07/68] fix: Window Title Bar and Maximize Icon Not Updated Correctly When Restoring Maximized State via Code #1453 (#1466) * Fix: Title Bar MaxButton Fix: Title Bar MaxButton When Maximizing Window Programmatically * Update: Improved Client Area Border Handling on Programmatic Maximize Update: Improved Client Area Border Handling on Programmatic Maximize --- src/Wpf.Ui/Controls/ClientAreaBorder/ClientAreaBorder.cs | 3 +++ src/Wpf.Ui/Controls/TitleBar/TitleBar.cs | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/Wpf.Ui/Controls/ClientAreaBorder/ClientAreaBorder.cs b/src/Wpf.Ui/Controls/ClientAreaBorder/ClientAreaBorder.cs index 58f50bc1b..c7c0cc516 100644 --- a/src/Wpf.Ui/Controls/ClientAreaBorder/ClientAreaBorder.cs +++ b/src/Wpf.Ui/Controls/ClientAreaBorder/ClientAreaBorder.cs @@ -146,6 +146,9 @@ protected override void OnVisualParentChanged(DependencyObject oldParent) { newWindow.StateChanged -= OnWindowStateChanged; // Unsafe newWindow.StateChanged += OnWindowStateChanged; + Thickness padding = + newWindow.WindowState == WindowState.Maximized ? WindowChromeNonClientFrameThickness : default; + SetCurrentValue(PaddingProperty, padding); newWindow.Closing += OnWindowClosing; } diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs index 471ba3bfc..58d4eb7d6 100644 --- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs +++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs @@ -447,6 +447,11 @@ protected virtual void OnLoaded(object sender, RoutedEventArgs e) _currentWindow = System.Windows.Window.GetWindow(this) ?? throw new InvalidOperationException("Window is null"); + if (_currentWindow.WindowState == WindowState.Maximized) + { + SetCurrentValue(IsMaximizedProperty, true); + _currentWindow.SetCurrentValue(Window.WindowStateProperty, WindowState.Maximized); + } _currentWindow.StateChanged += OnParentWindowStateChanged; _currentWindow.ContentRendered += OnWindowContentRendered; } From 3d577e98d1da4dd7f3d3613610ec52a771bd57c2 Mon Sep 17 00:00:00 2001 From: maihcx <59072697+maihcx@users.noreply.github.com> Date: Sun, 26 Oct 2025 01:35:00 +0700 Subject: [PATCH 08/68] fix: CardExpander is difficult to expand (#1552) * Fix #1551 * Remove Transparent background from Grid --- .../Controls/CardExpander/CardExpander.xaml | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml b/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml index 96a64b6fe..f11135e17 100644 --- a/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml +++ b/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml @@ -25,34 +25,36 @@ 16.0 - - - - - - - - - - - + + + + + + + + + + + + + - + From 636666d22ea184e72ec181eed5f3ae25f153d8fa Mon Sep 17 00:00:00 2001 From: apachezy Date: Sun, 26 Oct 2025 02:39:19 +0800 Subject: [PATCH 09/68] fix: Navigation buttons jumping. (#1542) Co-authored-by: pomian <13592821+pomianowski@users.noreply.github.com> --- .../NavigationView/NavigationView.Base.cs | 9 +++-- .../NavigationViewBasePaneButtonStyle.xaml | 6 ++-- .../NavigationView/NavigationViewCompact.xaml | 36 +++++++++++++++++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Base.cs b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Base.cs index eb09d3f74..e781f7469 100644 --- a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Base.cs +++ b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Base.cs @@ -70,7 +70,7 @@ public NavigationView() private static readonly Thickness TitleBarPaneOpenMarginDefault = new(35, 0, 0, 0); private static readonly Thickness TitleBarPaneCompactMarginDefault = new(35, 0, 0, 0); - private static readonly Thickness AutoSuggestBoxMarginDefault = new(8, 8, 8, 16); + private static readonly Thickness AutoSuggestBoxMarginDefault = new(8, 0, 8, 0); private static readonly Thickness FrameMarginDefault = new(0, 50, 0, 0); protected static void UpdateVisualState(NavigationView navigationView) @@ -201,7 +201,12 @@ protected virtual void OnToggleButtonClick(object sender, RoutedEventArgs e) protected virtual void AutoSuggestBoxSymbolButtonOnClick(object sender, RoutedEventArgs e) { SetCurrentValue(IsPaneOpenProperty, !IsPaneOpen); - _ = AutoSuggestBox?.Focus(); + + // Should not call .Focus() immediately. + _ = Dispatcher.BeginInvoke( + () => AutoSuggestBox?.Focus(), + System.Windows.Threading.DispatcherPriority.Input + ); } /// diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml index 648d2b787..9bf704468 100644 --- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml +++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml @@ -39,8 +39,8 @@ CornerRadius="{TemplateBinding Border.CornerRadius}"> - - + + + + diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml index 03a7524a3..b8f71c754 100644 --- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml +++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml @@ -352,7 +352,7 @@ Margin="0,0,0,6" Icon="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=AutoSuggestBox.Icon}" Style="{StaticResource BasePaneButtonStyle}" - Visibility="Collapsed" /> + Visibility="Hidden" /> @@ -464,6 +464,11 @@ + + + + + + + + + @@ -491,11 +523,11 @@ - + From aac47a49be39b46e2e289a25b3d0f097037666d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Nils=20Kuklau?= Date: Sun, 26 Oct 2025 21:46:12 +0100 Subject: [PATCH 10/68] fix: make `UiApplication` instance thread-static instead of static (#1553) --- src/Wpf.Ui/UiApplication.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Wpf.Ui/UiApplication.cs b/src/Wpf.Ui/UiApplication.cs index 43b1e92f2..37f4c5a4f 100644 --- a/src/Wpf.Ui/UiApplication.cs +++ b/src/Wpf.Ui/UiApplication.cs @@ -10,6 +10,7 @@ namespace Wpf.Ui; /// public class UiApplication { + [ThreadStatic] private static UiApplication? _uiApplication; private readonly Application? _application; From a6dad2e7010eb385303f11eae4910b8f5e7ee4bc Mon Sep 17 00:00:00 2001 From: apachezy Date: Tue, 28 Oct 2025 13:32:01 +0800 Subject: [PATCH 11/68] fix(ListView): use themed brush for disabled background (#1554) --- src/Wpf.Ui/Controls/ListView/ListView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml index 6e6eb9711..f54db38bd 100644 --- a/src/Wpf.Ui/Controls/ListView/ListView.xaml +++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml @@ -132,7 +132,7 @@ - + From 19b0fe53fb25af04f7d94acd4c18de97ee5525cf Mon Sep 17 00:00:00 2001 From: apachezy Date: Thu, 30 Oct 2025 06:12:27 +0800 Subject: [PATCH 12/68] fix: AutoSuggestBox should not occupy space if it does not exist or is not visible. (#1556) --- .../Controls/NavigationView/NavigationViewCompact.xaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml index b8f71c754..772fe9427 100644 --- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml +++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml @@ -528,7 +528,15 @@ + + + + + + + + From d92eed3fbfd71d3b6b3b07915faa1f7d5ecb182b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Little=E4=B8=B6Dreams?= Date: Sun, 2 Nov 2025 02:27:10 +0800 Subject: [PATCH 13/68] fix: UpdateAutoSuggestBoxSuggestions When MenuItems_CollectionChanged (#1558) --- .../Controls/NavigationView/NavigationView.Properties.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs index 47aa0758f..80a210ab0 100644 --- a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs +++ b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs @@ -511,6 +511,8 @@ NotifyCollectionChangedEventArgs e private void OnMenuItems_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) { + UpdateAutoSuggestBoxSuggestions(); + if (e.NewItems is null) { return; @@ -550,6 +552,8 @@ private static void OnMenuItemsSourceChanged(DependencyObject? d, DependencyProp private void OnFooterMenuItems_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) { + UpdateAutoSuggestBoxSuggestions(); + if (e.NewItems is null) { return; From 376cf30342f35bd04fcb2d1b8282d030f17d6e8a Mon Sep 17 00:00:00 2001 From: pomian <13592821+pomianowski@users.noreply.github.com> Date: Thu, 6 Nov 2025 15:54:36 +0100 Subject: [PATCH 14/68] test: Create new integraiton tests with FlaUI UIA3 and XUnit v3; format XAML (#1559) --- .editorconfig | 2 + Directory.Packages.props | 7 +- README.md | 16 +- Wpf.Ui.sln | 38 +- .../Wpf.Ui.Demo.Console/Views/MainView.xaml | 153 +- .../Views/Pages/DashboardPage.xaml | 62 +- .../Views/Pages/DataPage.xaml | 80 +- .../Views/Pages/SettingsPage.xaml | 79 +- .../Wpf.Ui.Demo.Console/Views/SimpleView.xaml | 45 +- samples/Wpf.Ui.Demo.Dialogs/App.xaml | 9 +- samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml | 55 +- samples/Wpf.Ui.Demo.Mvvm/App.xaml | 31 +- .../Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml | 145 +- .../Views/Pages/DashboardPage.xaml | 67 +- .../Views/Pages/DataPage.xaml | 82 +- .../Views/Pages/SettingsPage.xaml | 90 +- .../Wpf.Ui.Demo.SetResources.Simple/App.xaml | 12 +- .../MainWindow.xaml | 212 +- .../Views/Pages/DashboardPage.xaml | 58 +- .../Views/Pages/DataPage.xaml | 78 +- .../Views/Pages/ExpanderPage.xaml | 120 +- .../Views/Pages/SettingsPage.xaml | 75 +- samples/Wpf.Ui.Demo.Simple/App.xaml | 27 +- samples/Wpf.Ui.Demo.Simple/MainWindow.xaml | 195 +- .../Views/Pages/DashboardPage.xaml | 60 +- .../Views/Pages/DataPage.xaml | 80 +- .../Views/Pages/SettingsPage.xaml | 77 +- src/Wpf.Ui.Extension.Template.Blank/App.xaml | 31 +- .../App.xaml | 31 +- .../Views/Pages/DashboardPage.xaml | 67 +- .../Views/Pages/DataPage.xaml | 82 +- .../Views/Pages/SettingsPage.xaml | 90 +- .../Views/Windows/MainWindow.xaml | 145 +- src/Wpf.Ui.Extension.Template.Fluent/App.xaml | 31 +- .../Views/Pages/DashboardPage.xaml | 67 +- .../Views/Pages/DataPage.xaml | 82 +- .../Views/Pages/SettingsPage.xaml | 90 +- .../Views/Windows/MainWindow.xaml | 122 +- src/Wpf.Ui.Gallery/App.xaml | 60 +- .../Controllers/MonacoController.cs | 3 +- .../Controls/ControlExample.xaml | 194 +- .../Controls/GalleryNavigationPresenter.xaml | 125 +- .../Controls/PageControlDocumentation.xaml | 130 +- .../Controls/TermsOfUseContentDialog.xaml | 121 +- .../Controls/TypographyControl.xaml | 102 +- .../Views/Pages/AllControlsPage.xaml | 45 +- .../Views/Pages/BasicInput/AnchorPage.xaml | 89 +- .../Pages/BasicInput/BasicInputPage.xaml | 138 +- .../Views/Pages/BasicInput/ButtonPage.xaml | 252 +- .../Views/Pages/BasicInput/CheckBoxPage.xaml | 135 +- .../Views/Pages/BasicInput/ComboBoxPage.xaml | 126 +- .../Pages/BasicInput/DropDownButtonPage.xaml | 67 +- .../Pages/BasicInput/HyperlinkButtonPage.xaml | 139 +- .../Pages/BasicInput/RadioButtonPage.xaml | 142 +- .../Views/Pages/BasicInput/RatingPage.xaml | 157 +- .../Views/Pages/BasicInput/SliderPage.xaml | 269 +-- .../Pages/BasicInput/SplitButtonPage.xaml | 179 +- .../Views/Pages/BasicInput/ThumbRatePage.xaml | 81 +- .../Pages/BasicInput/ToggleButtonPage.xaml | 81 +- .../Pages/BasicInput/ToggleSwitchPage.xaml | 88 +- .../Pages/Collections/CollectionsPage.xaml | 136 +- .../Views/Pages/Collections/DataGridPage.xaml | 81 +- .../Views/Pages/Collections/ListBoxPage.xaml | 79 +- .../Views/Pages/Collections/ListViewPage.xaml | 268 ++- .../Views/Pages/Collections/TreeListPage.xaml | 40 +- .../Views/Pages/Collections/TreeViewPage.xaml | 81 +- .../Views/Pages/DashboardPage.xaml | 457 ++-- .../DateAndTime/CalendarDatePickerPage.xaml | 89 +- .../Views/Pages/DateAndTime/CalendarPage.xaml | 48 +- .../Pages/DateAndTime/DateAndTimePage.xaml | 136 +- .../Pages/DateAndTime/DatePickerPage.xaml | 48 +- .../Pages/DateAndTime/TimePickerPage.xaml | 58 +- .../Pages/DesignGuidance/ColorsPage.xaml | 456 ++-- .../Views/Pages/DesignGuidance/IconsPage.xaml | 329 ++- .../Pages/DesignGuidance/TypographyPage.xaml | 214 +- .../DialogsAndFlyouts/ContentDialogPage.xaml | 95 +- .../DialogsAndFlyoutsPage.xaml | 138 +- .../Pages/DialogsAndFlyouts/FlyoutPage.xaml | 104 +- .../DialogsAndFlyouts/MessageBoxPage.xaml | 72 +- .../Pages/DialogsAndFlyouts/SnackbarPage.xaml | 148 +- .../Views/Pages/Layout/CardActionPage.xaml | 137 +- .../Views/Pages/Layout/CardControlPage.xaml | 240 +- .../Views/Pages/Layout/ExpanderPage.xaml | 238 +- .../Views/Pages/Layout/LayoutPage.xaml | 138 +- .../Views/Pages/Media/CanvasPage.xaml | 86 +- .../Views/Pages/Media/ImagePage.xaml | 99 +- .../Views/Pages/Media/MediaPage.xaml | 138 +- .../Views/Pages/Media/WebBrowserPage.xaml | 69 +- .../Views/Pages/Media/WebViewPage.xaml | 67 +- .../Pages/Navigation/BreadcrumbBarPage.xaml | 158 +- .../Views/Pages/Navigation/MenuPage.xaml | 111 +- .../Navigation/MultilevelNavigationPage.xaml | 55 +- .../Pages/Navigation/NavigationPage.xaml | 138 +- .../Pages/Navigation/NavigationViewPage.xaml | 699 +++--- .../Pages/Navigation/TabControlPage.xaml | 95 +- .../Views/Pages/Navigation/TabViewPage.xaml | 95 +- .../Views/Pages/OpSystem/ClipboardPage.xaml | 144 +- .../Views/Pages/OpSystem/FilePickerPage.xaml | 375 ++- .../Views/Pages/OpSystem/OpSystemPage.xaml | 134 +- .../MultilevelNavigationSamplePage1.xaml | 72 +- .../MultilevelNavigationSamplePage2.xaml | 72 +- .../MultilevelNavigationSamplePage3.xaml | 72 +- .../Views/Pages/Samples/SamplePage1.xaml | 72 +- .../Views/Pages/Samples/SamplePage2.xaml | 65 +- .../Views/Pages/Samples/SamplePage3.xaml | 72 +- .../Views/Pages/SettingsPage.xaml | 300 ++- .../Pages/StatusAndInfo/InfoBadgePage.xaml | 312 ++- .../Pages/StatusAndInfo/InfoBarPage.xaml | 203 +- .../Pages/StatusAndInfo/ProgressBarPage.xaml | 49 +- .../Pages/StatusAndInfo/ProgressRingPage.xaml | 51 +- .../StatusAndInfo/StatusAndInfoPage.xaml | 138 +- .../Pages/StatusAndInfo/ToolTipPage.xaml | 58 +- .../Views/Pages/Text/AutoSuggestBoxPage.xaml | 83 +- .../Views/Pages/Text/LabelPage.xaml | 83 +- .../Views/Pages/Text/NumberBoxPage.xaml | 115 +- .../Views/Pages/Text/PasswordBoxPage.xaml | 70 +- .../Views/Pages/Text/RichTextBoxPage.xaml | 47 +- .../Views/Pages/Text/TextBlockPage.xaml | 97 +- .../Views/Pages/Text/TextBoxPage.xaml | 77 +- .../Views/Pages/Text/TextPage.xaml | 136 +- .../Views/Pages/Windows/WindowsPage.xaml | 118 +- .../Views/Windows/EditorWindow.xaml | 475 ++-- .../Views/Windows/MainWindow.xaml | 201 +- .../Views/Windows/MonacoWindow.xaml | 407 ++-- .../Views/Windows/SandboxWindow.xaml | 225 +- .../Controls/CodeBlock.xaml | 118 +- .../SyntaxHighlight.xaml | 18 +- .../Controls/AccessText/AccessText.xaml | 34 +- src/Wpf.Ui/Controls/Anchor/Anchor.xaml | 29 +- .../AutoSuggestBox/AutoSuggestBox.xaml | 372 +-- src/Wpf.Ui/Controls/Badge/Badge.xaml | 152 +- .../Controls/BreadcrumbBar/BreadcrumbBar.xaml | 220 +- src/Wpf.Ui/Controls/Button/Button.xaml | 932 ++++---- src/Wpf.Ui/Controls/Calendar/Calendar.xaml | 1044 +++++---- .../CalendarDatePicker.xaml | 43 +- src/Wpf.Ui/Controls/Card/Card.xaml | 146 +- .../Controls/CardAction/CardAction.xaml | 268 ++- src/Wpf.Ui/Controls/CardColor/CardColor.xaml | 95 +- .../Controls/CardControl/CardControl.xaml | 207 +- .../Controls/CardExpander/CardExpander.xaml | 499 ++-- src/Wpf.Ui/Controls/CheckBox/CheckBox.xaml | 335 +-- .../ClientAreaBorder/ClientAreaBorder.cs | 4 +- .../Controls/ColorPicker/ColorPicker.xaml | 13 +- src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml | 786 ++++--- .../Controls/ContentDialog/ContentDialog.xaml | 398 ++-- .../Controls/ContextMenu/ContextMenu.xaml | 126 +- .../ContextMenu/ContextMenuLoader.xaml | 8 +- src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml | 1879 ++++++++------- .../Controls/DatePicker/DatePicker.xaml | 443 ++-- .../DropDownButton/DropDownButton.xaml | 259 +- .../DynamicScrollBar/DynamicScrollBar.xaml | 854 +++---- .../DynamicScrollViewer.xaml | 127 +- src/Wpf.Ui/Controls/Expander/Expander.xaml | 440 ++-- .../Controls/FluentWindow/FluentWindow.xaml | 83 +- src/Wpf.Ui/Controls/Flyout/Flyout.xaml | 127 +- src/Wpf.Ui/Controls/Frame/Frame.xaml | 26 +- .../GridView/GridViewColumnHeader.xaml | 233 +- .../GridView/GridViewHeaderRowIndicator.xaml | 38 +- .../HyperlinkButton/HyperlinkButton.xaml | 229 +- src/Wpf.Ui/Controls/Image/Image.xaml | 87 +- src/Wpf.Ui/Controls/InfoBadge/InfoBadge.xaml | 425 ++-- src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml | 290 +-- .../Controls/ItemsControl/ItemsControl.xaml | 10 +- src/Wpf.Ui/Controls/Label/Label.xaml | 20 +- src/Wpf.Ui/Controls/ListBox/ListBox.xaml | 99 +- src/Wpf.Ui/Controls/ListBox/ListBoxItem.xaml | 97 +- src/Wpf.Ui/Controls/ListView/ListView.xaml | 337 +-- .../Controls/ListView/ListViewItem.xaml | 230 +- .../Controls/LoadingScreen/LoadingScreen.xaml | 67 +- src/Wpf.Ui/Controls/Menu/Menu.xaml | 56 +- src/Wpf.Ui/Controls/Menu/MenuItem.xaml | 2076 +++++++++-------- src/Wpf.Ui/Controls/Menu/MenuLoader.xaml | 10 +- .../Controls/MessageBox/MessageBox.xaml | 332 +-- .../NavigationView/NavigationLeftFluent.xaml | 324 +-- .../NavigationView/NavigationView.Base.cs | 2 +- .../NavigationView/NavigationView.xaml | 116 +- .../NavigationViewBasePaneButtonStyle.xaml | 219 +- .../NavigationView/NavigationViewBottom.xaml | 361 ++- .../NavigationViewBreadcrumbItem.xaml | 21 +- .../NavigationView/NavigationViewCompact.xaml | 1070 ++++----- .../NavigationViewConstants.xaml | 34 +- .../NavigationViewContentPresenter.xaml | 85 +- .../NavigationViewItemDefaultStyle.xaml | 50 +- .../NavigationViewItemHeader.xaml | 103 +- .../NavigationViewItemSeparator.xaml | 51 +- .../NavigationViewLeftMinimalCompact.xaml | 378 +-- .../NavigationView/NavigationViewTop.xaml | 682 +++--- src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml | 546 +++-- src/Wpf.Ui/Controls/Page/Page.xaml | 66 +- .../Controls/PasswordBox/PasswordBox.cs | 24 +- .../Controls/PasswordBox/PasswordBox.xaml | 712 +++--- .../Controls/ProgressBar/ProgressBar.xaml | 222 +- .../Controls/ProgressRing/ProgressRing.xaml | 192 +- .../Controls/RadioButton/RadioButton.xaml | 366 +-- .../Controls/RatingControl/RatingControl.xaml | 188 +- .../Controls/RichTextBox/RichTextBox.xaml | 151 +- src/Wpf.Ui/Controls/ScrollBar/ScrollBar.xaml | 735 +++--- .../Controls/ScrollViewer/ScrollViewer.xaml | 116 +- src/Wpf.Ui/Controls/Separator/Separator.xaml | 51 +- src/Wpf.Ui/Controls/Slider/Slider.xaml | 397 ++-- src/Wpf.Ui/Controls/Snackbar/Snackbar.xaml | 582 ++--- .../Controls/SplitButton/SplitButton.xaml | 384 +-- src/Wpf.Ui/Controls/StatusBar/StatusBar.xaml | 84 +- .../Controls/TabControl/TabControl.xaml | 259 +- src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml | 34 +- src/Wpf.Ui/Controls/TextBox/TextBox.xaml | 752 +++--- src/Wpf.Ui/Controls/ThumbRate/ThumbRate.xaml | 125 +- .../Controls/TimePicker/TimePicker.xaml | 231 +- src/Wpf.Ui/Controls/TitleBar/TitleBar.cs | 3 +- src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml | 483 ++-- .../Controls/ToggleButton/ToggleButton.xaml | 270 ++- .../Controls/ToggleSwitch/ToggleSwitch.xaml | 637 ++--- src/Wpf.Ui/Controls/ToolBar/ToolBar.xaml | 517 ++-- src/Wpf.Ui/Controls/ToolTip/ToolTip.xaml | 102 +- src/Wpf.Ui/Controls/TreeGrid/TreeGrid.xaml | 150 +- src/Wpf.Ui/Controls/TreeView/TreeView.xaml | 113 +- .../Controls/TreeView/TreeViewItem.xaml | 648 ++--- .../VirtualizingGridView.xaml | 120 +- .../VirtualizingItemsControl.xaml | 84 +- .../VirtualizingWrapPanel.xaml | 26 +- src/Wpf.Ui/Controls/Window/Window.xaml | 115 +- src/Wpf.Ui/Extensions/UiElementExtensions.cs | 3 +- src/Wpf.Ui/Resources/Accent.xaml | 92 +- src/Wpf.Ui/Resources/DefaultContextMenu.xaml | 18 +- .../Resources/DefaultFocusVisualStyle.xaml | 43 +- .../DefaultTextBoxScrollViewerStyle.xaml | 51 +- src/Wpf.Ui/Resources/Fonts.xaml | 26 +- src/Wpf.Ui/Resources/Palette.xaml | 94 +- src/Wpf.Ui/Resources/StaticColors.xaml | 107 +- src/Wpf.Ui/Resources/Theme/Dark.xaml | 1768 ++++++++------ src/Wpf.Ui/Resources/Theme/HC1.xaml | 1743 ++++++++------ src/Wpf.Ui/Resources/Theme/HC2.xaml | 1742 ++++++++------ src/Wpf.Ui/Resources/Theme/HCBlack.xaml | 1742 ++++++++------ src/Wpf.Ui/Resources/Theme/HCWhite.xaml | 1742 ++++++++------ src/Wpf.Ui/Resources/Theme/Light.xaml | 1777 ++++++++------ src/Wpf.Ui/Resources/Typography.xaml | 143 +- src/Wpf.Ui/Resources/Variables.xaml | 63 +- src/Wpf.Ui/Resources/Wpf.Ui.xaml | 185 +- .../Fixtures/AutoSuggestBox.cs | 47 + .../Fixtures/TestedApplication.cs | 85 + .../Fixtures/UiTest.cs | 110 + .../GlobalUsings.cs} | 11 +- .../NavigationTests.cs | 50 + .../TitleBarTests.cs | 24 + .../WindowTests.cs | 17 + .../Wpf.Ui.Gallery.IntegrationTests.csproj | 38 + .../xunit.runner.json | 6 + tests/Wpf.Ui.Gallery.UnitTests/Usings.cs | 6 - .../Wpf.Ui.Gallery.UnitTests.csproj | 26 - 249 files changed, 29482 insertions(+), 25458 deletions(-) create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/Fixtures/AutoSuggestBox.cs create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/Fixtures/TestedApplication.cs create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/Fixtures/UiTest.cs rename tests/{Wpf.Ui.Gallery.UnitTests/UnitTest1.cs => Wpf.Ui.Gallery.IntegrationTests/GlobalUsings.cs} (62%) create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/NavigationTests.cs create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/TitleBarTests.cs create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/WindowTests.cs create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/Wpf.Ui.Gallery.IntegrationTests.csproj create mode 100644 tests/Wpf.Ui.Gallery.IntegrationTests/xunit.runner.json delete mode 100644 tests/Wpf.Ui.Gallery.UnitTests/Usings.cs delete mode 100644 tests/Wpf.Ui.Gallery.UnitTests/Wpf.Ui.Gallery.UnitTests.csproj diff --git a/.editorconfig b/.editorconfig index 1512d3664..979b3a007 100644 --- a/.editorconfig +++ b/.editorconfig @@ -348,6 +348,8 @@ dotnet_diagnostic.CA2242.severity = warning # Require file header OR A source file contains a header that does not match the required text dotnet_diagnostic.IDE0073.severity = error +dotnet_diagnostic.IDE0058.severity = silent + # StyleCop Code Analysis # Closing parenthesis should be spaced correctly: "foo()!" diff --git a/Directory.Packages.props b/Directory.Packages.props index 9f1533ae6..9a614b6fb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,14 +1,16 @@ + + - + @@ -24,7 +26,8 @@ - + + diff --git a/README.md b/README.md index de073f939..6dc5c95af 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # WPF UI -[Created with ❤ in Poland by lepo.co](https://lepo.co/) and [wonderful open-source community](https://github.com/lepoco/wpfui/graphs/contributors) +[Created with ❤ in Poland by Leszek Pomianowski](https://lepo.co/) and [wonderful open-source community](https://github.com/lepoco/wpfui/graphs/contributors). WPF UI provides the Fluent experience in your known and loved WPF framework. Intuitive design, themes, navigation and new immersive controls. All natively and effortlessly. Library changes the base elements like `Page`, `ToggleButton` or `List`, and also includes additional controls like `Navigation`, `NumberBox`, `Dialog` or `Snackbar`. [![Discord](https://img.shields.io/discord/1071051348348514375?label=discord)](https://discord.gg/AR9ywDUwGq) [![GitHub license](https://img.shields.io/github/license/lepoco/wpfui)](https://github.com/lepoco/wpfui/blob/master/LICENSE) [![Nuget](https://img.shields.io/nuget/v/WPF-UI)](https://www.nuget.org/packages/WPF-UI/) [![Nuget](https://img.shields.io/nuget/dt/WPF-UI?label=nuget)](https://www.nuget.org/packages/WPF-UI/) @@ -85,7 +85,7 @@ First, your application needs to load custom styles, add in the **MyApp\App.xaml - + @@ -121,18 +121,6 @@ Now you can create fantastic apps, e.g. with one button: ``` -## Special thanks - -Crafting apps for .NET without the creators of tools like ReSharper or XAML Styler would never be such a fantastic adventure. - -- [🔗 JetBrains ReSharper](https://www.jetbrains.com/resharper/) -- [🔗 XAML Styler](https://github.com/Xavalon/XamlStyler) - -JetBrains was kind enough to lend a license for the open-source **dotUltimate** for WPF UI development. Learn more here: - -- https://www.jetbrains.com/dotnet/ -- https://www.jetbrains.com/opensource/ - ## Microsoft Property Design of the interface, choice of colors and the appearance of the controls were inspired by projects made by Microsoft for Windows 11. diff --git a/Wpf.Ui.sln b/Wpf.Ui.sln index 043f85d80..46fc3251a 100644 --- a/Wpf.Ui.sln +++ b/Wpf.Ui.sln @@ -31,8 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{35AC6218 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.Extension", "src\Wpf.Ui.Extension\Wpf.Ui.Extension.csproj", "{1298D974-9D81-4A93-9374-EA6A0E723DEB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wpf.Ui.Gallery.UnitTests", "tests\Wpf.Ui.Gallery.UnitTests\Wpf.Ui.Gallery.UnitTests.csproj", "{4059EB00-22B3-4EF9-A509-469CE8B0096D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.Extension.Template.Compact", "src\Wpf.Ui.Extension.Template.Compact\Wpf.Ui.Extension.Template.Compact.csproj", "{14D7431C-6CFF-4191-BB88-2B8D5F323A30}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.Extension.Template.Blank", "src\Wpf.Ui.Extension.Template.Blank\Wpf.Ui.Extension.Template.Blank.csproj", "{AB3D44B5-9491-487E-A134-9AC5BED2B981}" @@ -61,6 +59,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.DependencyInjection" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.Demo.SetResources.Simple", "samples\Wpf.Ui.Demo.SetResources.Simple\Wpf.Ui.Demo.SetResources.Simple.csproj", "{3B424CF4-09F8-47D3-8420-53D7A1165B9C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.Gallery.IntegrationTests", "tests\Wpf.Ui.Gallery.IntegrationTests\Wpf.Ui.Gallery.IntegrationTests.csproj", "{A396F1D6-55CF-493E-B541-A50B8F29395A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -162,22 +162,6 @@ Global {1298D974-9D81-4A93-9374-EA6A0E723DEB}.Release|x64.ActiveCfg = Release|x64 {1298D974-9D81-4A93-9374-EA6A0E723DEB}.Release|x64.Build.0 = Release|x64 {1298D974-9D81-4A93-9374-EA6A0E723DEB}.Release|x86.ActiveCfg = Release|x86 - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|arm64.ActiveCfg = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|arm64.Build.0 = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|x64.ActiveCfg = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|x64.Build.0 = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|x86.ActiveCfg = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Debug|x86.Build.0 = Debug|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|Any CPU.Build.0 = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|arm64.ActiveCfg = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|arm64.Build.0 = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|x64.ActiveCfg = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|x64.Build.0 = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|x86.ActiveCfg = Release|Any CPU - {4059EB00-22B3-4EF9-A509-469CE8B0096D}.Release|x86.Build.0 = Release|Any CPU {14D7431C-6CFF-4191-BB88-2B8D5F323A30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14D7431C-6CFF-4191-BB88-2B8D5F323A30}.Debug|arm64.ActiveCfg = Debug|arm64 {14D7431C-6CFF-4191-BB88-2B8D5F323A30}.Debug|x64.ActiveCfg = Debug|x64 @@ -371,18 +355,34 @@ Global {3B424CF4-09F8-47D3-8420-53D7A1165B9C}.Release|x64.Build.0 = Release|Any CPU {3B424CF4-09F8-47D3-8420-53D7A1165B9C}.Release|x86.ActiveCfg = Release|Any CPU {3B424CF4-09F8-47D3-8420-53D7A1165B9C}.Release|x86.Build.0 = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|arm64.ActiveCfg = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|arm64.Build.0 = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|x64.ActiveCfg = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|x64.Build.0 = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|x86.ActiveCfg = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Debug|x86.Build.0 = Debug|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|Any CPU.Build.0 = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|arm64.ActiveCfg = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|arm64.Build.0 = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|x64.ActiveCfg = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|x64.Build.0 = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|x86.ActiveCfg = Release|Any CPU + {A396F1D6-55CF-493E-B541-A50B8F29395A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {AE87BE68-DFDC-46D8-BC55-DC9D1DD47F4C} = {35AC6218-CBEA-4FDA-8CE1-D1EBD6FD8D4A} - {4059EB00-22B3-4EF9-A509-469CE8B0096D} = {35AC6218-CBEA-4FDA-8CE1-D1EBD6FD8D4A} {6F1F6A8D-A530-4C4F-9360-219AC3B43FAA} = {D7EA6A65-3CB5-4A59-934A-B8402C849107} {5138077E-670E-413D-94D1-0825B6D1201B} = {D7EA6A65-3CB5-4A59-934A-B8402C849107} {E37CD05A-EBFC-429D-A550-BEE44119FA9E} = {D7EA6A65-3CB5-4A59-934A-B8402C849107} {7F6C7E7A-A4B5-4D12-88EB-217CA59284F4} = {D7EA6A65-3CB5-4A59-934A-B8402C849107} {3B424CF4-09F8-47D3-8420-53D7A1165B9C} = {D7EA6A65-3CB5-4A59-934A-B8402C849107} + {A396F1D6-55CF-493E-B541-A50B8F29395A} = {35AC6218-CBEA-4FDA-8CE1-D1EBD6FD8D4A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {234CB3F9-5ADC-433F-BDBD-CB8EA59EB518} diff --git a/samples/Wpf.Ui.Demo.Console/Views/MainView.xaml b/samples/Wpf.Ui.Demo.Console/Views/MainView.xaml index b66ebd279..3502038ca 100644 --- a/samples/Wpf.Ui.Demo.Console/Views/MainView.xaml +++ b/samples/Wpf.Ui.Demo.Console/Views/MainView.xaml @@ -1,79 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Console.Views.MainView" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Console.Views" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:pages="clr-namespace:Wpf.Ui.Demo.Console.Views.Pages" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="WPF UI - Console Demo" + Width="1200" + Height="654" + d:DesignHeight="650" + d:DesignWidth="900" + ExtendsContentIntoTitleBar="True" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Console/Views/Pages/DashboardPage.xaml b/samples/Wpf.Ui.Demo.Console/Views/Pages/DashboardPage.xaml index de5994650..b676e3bd2 100644 --- a/samples/Wpf.Ui.Demo.Console/Views/Pages/DashboardPage.xaml +++ b/samples/Wpf.Ui.Demo.Console/Views/Pages/DashboardPage.xaml @@ -1,35 +1,31 @@ - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Console.Views.Pages.DashboardPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Console.Views.Pages" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="DashboardPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Console/Views/Pages/DataPage.xaml b/samples/Wpf.Ui.Demo.Console/Views/Pages/DataPage.xaml index c3f158481..6a3d538f8 100644 --- a/samples/Wpf.Ui.Demo.Console/Views/Pages/DataPage.xaml +++ b/samples/Wpf.Ui.Demo.Console/Views/Pages/DataPage.xaml @@ -1,41 +1,43 @@ - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Console.Views.Pages.DataPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Console.Views.Pages" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:models="clr-namespace:Wpf.Ui.Demo.Console.Models" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="DataPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Console/Views/Pages/SettingsPage.xaml b/samples/Wpf.Ui.Demo.Console/Views/Pages/SettingsPage.xaml index 674b17d0d..1e771d30e 100644 --- a/samples/Wpf.Ui.Demo.Console/Views/Pages/SettingsPage.xaml +++ b/samples/Wpf.Ui.Demo.Console/Views/Pages/SettingsPage.xaml @@ -1,45 +1,38 @@ - - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Console.Views.Pages.SettingsPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Console.Views.Pages" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="SettingsPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Console/Views/SimpleView.xaml b/samples/Wpf.Ui.Demo.Console/Views/SimpleView.xaml index d3710b49e..1a2adace8 100644 --- a/samples/Wpf.Ui.Demo.Console/Views/SimpleView.xaml +++ b/samples/Wpf.Ui.Demo.Console/Views/SimpleView.xaml @@ -1,28 +1,25 @@ - - - - - + x:Class="Wpf.Ui.Demo.Console.Views.SimpleView" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Console.Views" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Width="64" + Height="64" + DataContext="{Binding RelativeSource={RelativeSource Self}}" + ExtendsContentIntoTitleBar="True" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + Change Theme - - + + diff --git a/samples/Wpf.Ui.Demo.Dialogs/App.xaml b/samples/Wpf.Ui.Demo.Dialogs/App.xaml index 6caa7edc6..793be7f30 100644 --- a/samples/Wpf.Ui.Demo.Dialogs/App.xaml +++ b/samples/Wpf.Ui.Demo.Dialogs/App.xaml @@ -1,5 +1,6 @@ + x:Class="Wpf.Ui.Demo.Dialogs.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + StartupUri="MainWindow.xaml" +/> diff --git a/samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml b/samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml index 7e6c222d6..627dc5a69 100644 --- a/samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml +++ b/samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml @@ -1,29 +1,30 @@ - - - - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Dialogs.MainWindow" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="WPF UI - Dialog sample" + Width="800" + Height="450" + mc:Ignorable="d" +> + + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Mvvm/App.xaml b/samples/Wpf.Ui.Demo.Mvvm/App.xaml index 8d20cc9cb..045c204ea 100644 --- a/samples/Wpf.Ui.Demo.Mvvm/App.xaml +++ b/samples/Wpf.Ui.Demo.Mvvm/App.xaml @@ -1,17 +1,18 @@ - - - - - - - - + x:Class="Wpf.Ui.Demo.Mvvm.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + DispatcherUnhandledException="OnDispatcherUnhandledException" + Exit="OnExit" + Startup="OnStartup" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml b/samples/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml index 179d1a81f..d9a83cf53 100644 --- a/samples/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml +++ b/samples/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml @@ -1,77 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + WindowCornerPreference="Round" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DashboardPage.xaml b/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DashboardPage.xaml index 5acff9813..16d4159a0 100644 --- a/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DashboardPage.xaml +++ b/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DashboardPage.xaml @@ -1,36 +1,37 @@ - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DataPage.xaml b/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DataPage.xaml index 98f55755b..211a878d3 100644 --- a/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DataPage.xaml +++ b/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/DataPage.xaml @@ -1,43 +1,45 @@ - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/SettingsPage.xaml b/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/SettingsPage.xaml index 336c8f721..0868f1306 100644 --- a/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/SettingsPage.xaml +++ b/samples/Wpf.Ui.Demo.Mvvm/Views/Pages/SettingsPage.xaml @@ -1,51 +1,45 @@  - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.SetResources.Simple/App.xaml b/samples/Wpf.Ui.Demo.SetResources.Simple/App.xaml index 9e62e915c..0486a598f 100644 --- a/samples/Wpf.Ui.Demo.SetResources.Simple/App.xaml +++ b/samples/Wpf.Ui.Demo.SetResources.Simple/App.xaml @@ -1,7 +1,7 @@ - + x:Class="Wpf.Ui.Demo.SetResources.Simple.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + StartupUri="MainWindow.xaml" +> diff --git a/samples/Wpf.Ui.Demo.SetResources.Simple/MainWindow.xaml b/samples/Wpf.Ui.Demo.SetResources.Simple/MainWindow.xaml index 333a6b88c..b65cc4d06 100644 --- a/samples/Wpf.Ui.Demo.SetResources.Simple/MainWindow.xaml +++ b/samples/Wpf.Ui.Demo.SetResources.Simple/MainWindow.xaml @@ -1,107 +1,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + x:Class="Wpf.Ui.Demo.SetResources.Simple.MainWindow" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tray="http://schemas.lepo.co/wpfui/2022/xaml/tray" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + xmlns:pages="clr-namespace:Wpf.Ui.Demo.SetResources.Simple.Views.Pages" + Title="WPF UI - Simple Demo" + Width="1100" + Height="650" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + WindowCornerPreference="Round" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DashboardPage.xaml b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DashboardPage.xaml index fa8266ddd..08570697f 100644 --- a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DashboardPage.xaml +++ b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DashboardPage.xaml @@ -1,33 +1,29 @@ - - - - - - - - - - + x:Class="Wpf.Ui.Demo.SetResources.Simple.Views.Pages.DashboardPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="DashboardPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DataPage.xaml b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DataPage.xaml index a4a665399..7babea085 100644 --- a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DataPage.xaml +++ b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DataPage.xaml @@ -1,40 +1,42 @@ - - - - - - - - - - + x:Class="Wpf.Ui.Demo.SetResources.Simple.Views.Pages.DataPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + xmlns:models="clr-namespace:Wpf.Ui.Demo.SetResources.Simple.Models" + Title="DataPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/ExpanderPage.xaml b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/ExpanderPage.xaml index 4bdad87dd..1abd1fc45 100644 --- a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/ExpanderPage.xaml +++ b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/ExpanderPage.xaml @@ -1,67 +1,55 @@  - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + x:Class="Wpf.Ui.Demo.SetResources.Simple.Views.Pages.ExpanderPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.SetResources.Simple.Views.Pages" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + mc:Ignorable="d" + Title="ExpanderPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" +> + + + + + + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/SettingsPage.xaml b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/SettingsPage.xaml index 28122a67c..2ec0d0a01 100644 --- a/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/SettingsPage.xaml +++ b/samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/SettingsPage.xaml @@ -1,43 +1,36 @@  - - - - - - - - - - - + x:Class="Wpf.Ui.Demo.SetResources.Simple.Views.Pages.SettingsPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="SettingsPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Simple/App.xaml b/samples/Wpf.Ui.Demo.Simple/App.xaml index d57167c26..fae622c78 100644 --- a/samples/Wpf.Ui.Demo.Simple/App.xaml +++ b/samples/Wpf.Ui.Demo.Simple/App.xaml @@ -1,15 +1,16 @@ - - - - - - - - + x:Class="Wpf.Ui.Demo.Simple.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + StartupUri="MainWindow.xaml" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Simple/MainWindow.xaml b/samples/Wpf.Ui.Demo.Simple/MainWindow.xaml index 4d430b511..ba09c4e6e 100644 --- a/samples/Wpf.Ui.Demo.Simple/MainWindow.xaml +++ b/samples/Wpf.Ui.Demo.Simple/MainWindow.xaml @@ -1,100 +1,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Simple.MainWindow" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Simple" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:pages="clr-namespace:Wpf.Ui.Demo.Simple.Views.Pages" + xmlns:tray="http://schemas.lepo.co/wpfui/2022/xaml/tray" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="WPF UI - Simple Demo" + Width="1100" + Height="650" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + WindowCornerPreference="Round" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml b/samples/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml index 55ec01c94..009d1729c 100644 --- a/samples/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml +++ b/samples/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml @@ -1,34 +1,30 @@ - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Simple.Views.Pages.DashboardPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Simple.Views.Pages" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="DashboardPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml b/samples/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml index bc5ccbedb..f3361347a 100644 --- a/samples/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml +++ b/samples/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml @@ -1,41 +1,43 @@ - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Simple.Views.Pages.DataPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Simple.Views.Pages" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:models="clr-namespace:Wpf.Ui.Demo.Simple.Models" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="DataPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + + diff --git a/samples/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml b/samples/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml index a3b2817b8..f208757f2 100644 --- a/samples/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml +++ b/samples/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml @@ -1,44 +1,37 @@  - - - - - - - - - - - + x:Class="Wpf.Ui.Demo.Simple.Views.Pages.SettingsPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Demo.Simple.Views.Pages" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="SettingsPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Blank/App.xaml b/src/Wpf.Ui.Extension.Template.Blank/App.xaml index ed1ed0c52..3ac11ba34 100644 --- a/src/Wpf.Ui.Extension.Template.Blank/App.xaml +++ b/src/Wpf.Ui.Extension.Template.Blank/App.xaml @@ -1,17 +1,18 @@  - - - - - - - - + x:Class="$safeprojectname$.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + DispatcherUnhandledException="OnDispatcherUnhandledException" + Exit="OnExit" + Startup="OnStartup" +> + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Compact/App.xaml b/src/Wpf.Ui.Extension.Template.Compact/App.xaml index ed37ef0f3..d8d4c2e32 100644 --- a/src/Wpf.Ui.Extension.Template.Compact/App.xaml +++ b/src/Wpf.Ui.Extension.Template.Compact/App.xaml @@ -1,17 +1,18 @@  - - - - - - - - + x:Class="$safeprojectname$.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + DispatcherUnhandledException="OnDispatcherUnhandledException" + Exit="OnExit" + Startup="OnStartup" +> + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DashboardPage.xaml b/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DashboardPage.xaml index 0cf585792..91b9bd841 100644 --- a/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DashboardPage.xaml +++ b/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DashboardPage.xaml @@ -1,36 +1,37 @@  - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DataPage.xaml b/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DataPage.xaml index 6268e0521..b745bb0f3 100644 --- a/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DataPage.xaml +++ b/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DataPage.xaml @@ -1,43 +1,45 @@ - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/SettingsPage.xaml b/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/SettingsPage.xaml index d0c1e49a8..06626db7e 100644 --- a/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/SettingsPage.xaml +++ b/src/Wpf.Ui.Extension.Template.Compact/Views/Pages/SettingsPage.xaml @@ -1,51 +1,45 @@  - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Compact/Views/Windows/MainWindow.xaml b/src/Wpf.Ui.Extension.Template.Compact/Views/Windows/MainWindow.xaml index 56ac1e0fe..5dae97a0b 100644 --- a/src/Wpf.Ui.Extension.Template.Compact/Views/Windows/MainWindow.xaml +++ b/src/Wpf.Ui.Extension.Template.Compact/Views/Windows/MainWindow.xaml @@ -1,75 +1,76 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + WindowCornerPreference="Round" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Fluent/App.xaml b/src/Wpf.Ui.Extension.Template.Fluent/App.xaml index ed37ef0f3..d8d4c2e32 100644 --- a/src/Wpf.Ui.Extension.Template.Fluent/App.xaml +++ b/src/Wpf.Ui.Extension.Template.Fluent/App.xaml @@ -1,17 +1,18 @@  - - - - - - - - + x:Class="$safeprojectname$.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + DispatcherUnhandledException="OnDispatcherUnhandledException" + Exit="OnExit" + Startup="OnStartup" +> + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DashboardPage.xaml b/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DashboardPage.xaml index 0cf585792..91b9bd841 100644 --- a/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DashboardPage.xaml +++ b/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DashboardPage.xaml @@ -1,36 +1,37 @@  - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DataPage.xaml b/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DataPage.xaml index 6268e0521..b745bb0f3 100644 --- a/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DataPage.xaml +++ b/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/DataPage.xaml @@ -1,43 +1,45 @@ - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d" +> + + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/SettingsPage.xaml b/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/SettingsPage.xaml index d0c1e49a8..06626db7e 100644 --- a/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/SettingsPage.xaml +++ b/src/Wpf.Ui.Extension.Template.Fluent/Views/Pages/SettingsPage.xaml @@ -1,51 +1,45 @@  - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + + + + diff --git a/src/Wpf.Ui.Extension.Template.Fluent/Views/Windows/MainWindow.xaml b/src/Wpf.Ui.Extension.Template.Fluent/Views/Windows/MainWindow.xaml index 698cc8559..19590e6c6 100644 --- a/src/Wpf.Ui.Extension.Template.Fluent/Views/Windows/MainWindow.xaml +++ b/src/Wpf.Ui.Extension.Template.Fluent/Views/Windows/MainWindow.xaml @@ -1,65 +1,63 @@  - - - - - - - - - - - - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + WindowCornerPreference="Round" + WindowStartupLocation="CenterScreen" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Wpf.Ui.Gallery/App.xaml b/src/Wpf.Ui.Gallery/App.xaml index 1c2e59256..accc104d7 100644 --- a/src/Wpf.Ui.Gallery/App.xaml +++ b/src/Wpf.Ui.Gallery/App.xaml @@ -1,33 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/Wpf.Ui.Gallery/Controllers/MonacoController.cs b/src/Wpf.Ui.Gallery/Controllers/MonacoController.cs index 1c26128d6..b6a51231a 100644 --- a/src/Wpf.Ui.Gallery/Controllers/MonacoController.cs +++ b/src/Wpf.Ui.Gallery/Controllers/MonacoController.cs @@ -75,7 +75,8 @@ public void DispatchScript(string script) return; } - _ = Application.Current.Dispatcher.InvokeAsync(async () => await _webView!.ExecuteScriptAsync(script) + _ = Application.Current.Dispatcher.InvokeAsync(async () => + await _webView!.ExecuteScriptAsync(script) ); } } diff --git a/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml b/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml index 2ab2a2c20..e8903c5a0 100644 --- a/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml +++ b/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml @@ -1,104 +1,92 @@ - - - - - - + + + diff --git a/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml b/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml index 2600b11c4..e8a2454d3 100644 --- a/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml +++ b/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml @@ -1,62 +1,65 @@ - - - - + + diff --git a/src/Wpf.Ui.Gallery/Controls/PageControlDocumentation.xaml b/src/Wpf.Ui.Gallery/Controls/PageControlDocumentation.xaml index b958598b9..8709dcd62 100644 --- a/src/Wpf.Ui.Gallery/Controls/PageControlDocumentation.xaml +++ b/src/Wpf.Ui.Gallery/Controls/PageControlDocumentation.xaml @@ -1,67 +1,67 @@  - - - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" +> + diff --git a/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml b/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml index d4fd4773b..bae9a6302 100644 --- a/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml +++ b/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml @@ -1,68 +1,65 @@  - - - - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" +> + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml index dd422acfc..b754eb5c6 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml @@ -1,25 +1,26 @@ - - + d:DesignHeight="450" + d:DesignWidth="800" + g:PageControlDocumentation.Show="False" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml index ba92319b8..cee20d455 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml @@ -1,46 +1,49 @@ - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + + + + + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml index d4ae96b85..0f47e3ac9 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml @@ -1,77 +1,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + + + + + + + + + + + + + + + + + + + WPF UI provides the Fluent experience in your known and loved WPF framework. Intuitive design, themes, navigation and new immersive controls. All natively and effortlessly. Library changes the base elements like Page, ToggleButton or List, and also includes additional controls like Navigation, NumberBox, Dialog or Snackbar. - + Support the development of WPF UI and other innovative projects by becoming a sponsor on GitHub! Your monthly or one-time contributions help us continue to deliver high-quality, open-source solutions that empower developers worldwide. - - - - - + - - + + + + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml index 91d6247fe..5d337af0d 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml @@ -1,129 +1,129 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Text="{Binding ViewModel.SelectedSymbolName, Mode=OneWay}" + /> + + + + + + + + + + + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml index 7e9759ab7..76cdb0331 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml @@ -1,111 +1,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + x:Class="Wpf.Ui.Gallery.Views.Pages.DesignGuidance.TypographyPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.DesignGuidance" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="TypographyPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d" +> + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml index de232dbf5..ae4811b9a 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml @@ -1,51 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ScrollViewer.CanContentScroll="False" + mc:Ignorable="d"> + + + - - - - + + + - + - - - - - - - - + Margin="0,4,0,0" + Padding="0" + Content="Find out more about Fluent System Icons" + NavigateUri="https://github.com/microsoft/fluentui-system-icons" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml index 76cdb0331..7e9759ab7 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml @@ -1,109 +1,111 @@ - - - - - - - + x:Class="Wpf.Ui.Gallery.Views.Pages.DesignGuidance.TypographyPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.DesignGuidance" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + Title="TypographyPage" + d:DesignHeight="450" + d:DesignWidth="800" + ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}" + ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + mc:Ignorable="d"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml index ae4811b9a..de232dbf5 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialogPage.xaml @@ -1,50 +1,51 @@ - - - - - - - - - - - -