fix style

This commit is contained in:
DismissedLight
2022-05-05 22:52:41 +08:00
parent c8bcac59ee
commit 7b50f28e7e
6 changed files with 35 additions and 35 deletions

View File

@@ -2,21 +2,21 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation;
using Microsoft.UI.Xaml.Controls;
using System.ComponentModel;
namespace SettingsUI.Controls;
public class CheckBoxWithDescriptionControl : CheckBox
{
private CheckBoxWithDescriptionControl _checkBoxSubTextControl;
private readonly CheckBoxWithDescriptionControl _checkBoxSubTextControl;
public CheckBoxWithDescriptionControl()
{
_checkBoxSubTextControl = (CheckBoxWithDescriptionControl) this;
this.Loaded += CheckBoxSubTextControl_Loaded;
_checkBoxSubTextControl = this;
Loaded += CheckBoxSubTextControl_Loaded;
}
protected override void OnApplyTemplate()
@@ -41,7 +41,7 @@ public class CheckBoxWithDescriptionControl : CheckBox
if (!string.IsNullOrWhiteSpace(Description))
{
panel.Children.Add(new TextBlock() { Margin = new Thickness(0, 10, 0, 0), Text = Header });
panel.Children.Add(new IsEnabledTextBlock() { Style = (Style) Application.Current.Resources["SecondaryIsEnabledTextBlockStyle"], Text = Description });
panel.Children.Add(new IsEnabledTextBlock() { Style = (Style)Application.Current.Resources["SecondaryIsEnabledTextBlockStyle"], Text = Description });
}
else
{
@@ -66,14 +66,14 @@ public class CheckBoxWithDescriptionControl : CheckBox
[Localizable(true)]
public string Header
{
get => (string) GetValue(HeaderProperty);
get => (string)GetValue(HeaderProperty);
set => SetValue(HeaderProperty, value);
}
[Localizable(true)]
public string Description
{
get => (string) GetValue(DescriptionProperty);
get => (string)GetValue(DescriptionProperty);
set => SetValue(DescriptionProperty, value);
}
}

View File

@@ -2,9 +2,9 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System.ComponentModel;
namespace SettingsUI.Controls;
@@ -14,7 +14,7 @@ public class IsEnabledTextBlock : Control
{
public IsEnabledTextBlock()
{
this.DefaultStyleKey = typeof(IsEnabledTextBlock);
DefaultStyleKey = typeof(IsEnabledTextBlock);
}
protected override void OnApplyTemplate()
@@ -34,7 +34,7 @@ public class IsEnabledTextBlock : Control
[Localizable(true)]
public string Text
{
get => (string) GetValue(TextProperty);
get => (string)GetValue(TextProperty);
set => SetValue(TextProperty, value);
}

View File

@@ -2,10 +2,10 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation;
using Microsoft.UI.Xaml.Controls;
using System.ComponentModel;
namespace SettingsUI.Controls;
@@ -23,7 +23,7 @@ public class Setting : ContentControl
public Setting()
{
this.DefaultStyleKey = typeof(Setting);
DefaultStyleKey = typeof(Setting);
}
public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
@@ -53,35 +53,35 @@ public class Setting : ContentControl
[Localizable(true)]
public string Header
{
get => (string) GetValue(HeaderProperty);
get => (string)GetValue(HeaderProperty);
set => SetValue(HeaderProperty, value);
}
[Localizable(true)]
public object Description
{
get => (object) GetValue(DescriptionProperty);
get => GetValue(DescriptionProperty);
set => SetValue(DescriptionProperty, value);
}
public object Icon
{
get => (object) GetValue(IconProperty);
get => GetValue(IconProperty);
set => SetValue(IconProperty, value);
}
public object ActionContent
{
get => (object) GetValue(ActionContentProperty);
get => GetValue(ActionContentProperty);
set => SetValue(ActionContentProperty, value);
}
protected override void OnApplyTemplate()
{
IsEnabledChanged -= Setting_IsEnabledChanged;
_setting = (Setting) this;
_iconPresenter = (ContentPresenter) _setting.GetTemplateChild(PartIconPresenter);
_descriptionPresenter = (ContentPresenter) _setting.GetTemplateChild(PartDescriptionPresenter);
_setting = this;
_iconPresenter = (ContentPresenter)_setting.GetTemplateChild(PartIconPresenter);
_descriptionPresenter = (ContentPresenter)_setting.GetTemplateChild(PartDescriptionPresenter);
Update();
SetEnabledState();
IsEnabledChanged += Setting_IsEnabledChanged;
@@ -90,17 +90,17 @@ public class Setting : ContentControl
private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
((Setting) d).Update();
((Setting)d).Update();
}
private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
((Setting) d).Update();
((Setting)d).Update();
}
private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
((Setting) d).Update();
((Setting)d).Update();
}
private void Setting_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
@@ -127,7 +127,7 @@ public class Setting : ContentControl
// We do not want to override the default AutomationProperties.Name of a button. Its Content property already describes what it does.
if (!string.IsNullOrEmpty(_setting.Header))
{
AutomationProperties.SetName((UIElement) _setting.ActionContent, _setting.Header);
AutomationProperties.SetName((UIElement)_setting.ActionContent, _setting.Header);
}
}
}

View File

@@ -13,19 +13,19 @@ public partial class SettingExpander : Expander
public SettingExpander()
{
DefaultStyleKey = typeof(Expander);
this.Style = (Style) Application.Current.Resources["SettingExpanderStyle"];
this.RegisterPropertyChangedCallback(Expander.HeaderProperty, OnHeaderChanged);
Style = (Style)Application.Current.Resources["SettingExpanderStyle"];
RegisterPropertyChangedCallback(Expander.HeaderProperty, OnHeaderChanged);
}
private static void OnHeaderChanged(DependencyObject d, DependencyProperty dp)
{
SettingExpander self = (SettingExpander) d;
SettingExpander self = (SettingExpander)d;
if (self.Header != null)
{
if (self.Header.GetType() == typeof(Setting))
{
Setting selfSetting = (Setting) self.Header;
selfSetting.Style = (Style) Application.Current.Resources["ExpanderHeaderSettingStyle"];
Setting selfSetting = (Setting)self.Header;
selfSetting.Style = (Style)Application.Current.Resources["ExpanderHeaderSettingStyle"];
if (!string.IsNullOrEmpty(selfSetting.Header))
{

View File

@@ -2,10 +2,10 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation.Peers;
using Microsoft.UI.Xaml.Controls;
using System.ComponentModel;
namespace SettingsUI.Controls;
@@ -29,7 +29,7 @@ public partial class SettingsGroup : ItemsControl
[Localizable(true)]
public string Header
{
get => (string) GetValue(HeaderProperty);
get => (string)GetValue(HeaderProperty);
set => SetValue(HeaderProperty, value);
}
@@ -42,7 +42,7 @@ public partial class SettingsGroup : ItemsControl
[Localizable(true)]
public object Description
{
get => (object) GetValue(DescriptionProperty);
get => GetValue(DescriptionProperty);
set => SetValue(DescriptionProperty, value);
}
@@ -55,8 +55,8 @@ public partial class SettingsGroup : ItemsControl
protected override void OnApplyTemplate()
{
IsEnabledChanged -= SettingsGroup_IsEnabledChanged;
_settingsGroup = (SettingsGroup) this;
_descriptionPresenter = (ContentPresenter) _settingsGroup.GetTemplateChild(PartDescriptionPresenter);
_settingsGroup = this;
_descriptionPresenter = (ContentPresenter)_settingsGroup.GetTemplateChild(PartDescriptionPresenter);
SetEnabledState();
IsEnabledChanged += SettingsGroup_IsEnabledChanged;
base.OnApplyTemplate();
@@ -64,7 +64,7 @@ public partial class SettingsGroup : ItemsControl
private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
((SettingsGroup) d).Update();
((SettingsGroup)d).Update();
}
private void SettingsGroup_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)

View File

@@ -15,7 +15,7 @@ public class SettingsGroupAutomationPeer : FrameworkElementAutomationPeer
protected override string GetNameCore()
{
var selectedSettingsGroup = (SettingsGroup) Owner;
SettingsGroup? selectedSettingsGroup = (SettingsGroup)Owner;
return selectedSettingsGroup.Header;
}
}