From 5b478e717363d732ac6929a4c0fb0b76e7ac914b Mon Sep 17 00:00:00 2001 From: Yimeng Wu Date: Thu, 2 Nov 2023 22:44:44 +0000 Subject: [PATCH] Port microsoft/microsoft-ui-xaml#4294 --- .../CommandBarFlyout/CommandBarFlyout.xaml | 68 +++++++------ .../ContentDialog/ContentDialog.xaml | 16 +-- .../ToggleSwitch/ToggleSwitch.xaml | 98 ++++++++++--------- ModernWpf/ControlsResources.xaml | 2 +- ModernWpf/Styles/ComboBox.xaml | 3 +- ModernWpf/Styles/Common.xaml | 12 +++ ModernWpf/Styles/RadioButton.xaml | 40 ++++---- ModernWpf/Styles/Slider.xaml | 17 ++-- 8 files changed, 143 insertions(+), 113 deletions(-) create mode 100644 ModernWpf/Styles/Common.xaml diff --git a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml index 320eb769..106a5768 100644 --- a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml +++ b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml @@ -5,6 +5,10 @@ xmlns:ui="http://schemas.modernwpf.com/2019" xmlns:local="clr-namespace:ModernWpf.Controls" xmlns:primitives="clr-namespace:ModernWpf.Controls.Primitives"> + + + + @@ -516,11 +520,11 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/ModernWpf/Styles/Slider.xaml b/ModernWpf/Styles/Slider.xaml index 728d1239..8a5d86b0 100644 --- a/ModernWpf/Styles/Slider.xaml +++ b/ModernWpf/Styles/Slider.xaml @@ -7,6 +7,7 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib"> + @@ -74,11 +75,11 @@ - + - + @@ -86,11 +87,11 @@ - + - + @@ -98,11 +99,11 @@ - + - + @@ -110,11 +111,11 @@ - + - +