Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 20:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Settingsv2 fix warnings (#2076)

Browse Source 
* updating a ton of warnings.

* bunch of cleanup

* few smaller ones

* fixed naming

* reversing an oops

* adjusting json to use attribute

* more json properties
This commit is contained in:
Clint Rutkas
2020-04-10 15:22:07 -07:00
committed by GitHub
parent 3a46f4589b
commit 6fbed4ad5c
55 changed files with 354 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/Microsoft.PowerToys.Settings.UI/Behaviors/NavigationViewHeaderBehavior.cs
View File

@@ -1,4 +1,8 @@
using Microsoft.PowerToys.Settings.UI.Services;
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.PowerToys.Settings.UI.Services;
using Microsoft.Xaml.Interactivity;
using Windows.UI.Xaml;
@@ -18,8 +22,8 @@ namespace Microsoft.PowerToys.Settings.UI.Behaviors
public object DefaultHeader
{
get { return this.GetValue(DefaultHeaderProperty); }
set { this.SetValue(DefaultHeaderProperty, value); }
get { return GetValue(DefaultHeaderProperty); }
set { SetValue(DefaultHeaderProperty, value); }
}
public static readonly DependencyProperty DefaultHeaderProperty = DependencyProperty.Register("DefaultHeader", typeof(object), typeof(NavigationViewHeaderBehavior), new PropertyMetadata(null, (d, e) => current.UpdateHeader()));
@@ -67,13 +71,13 @@ namespace Microsoft.PowerToys.Settings.UI.Behaviors
{
base.OnAttached();
current = this;
NavigationService.Navigated += this.OnNavigated;
NavigationService.Navigated += OnNavigated;
}
protected override void OnDetaching()
{
base.OnDetaching();
NavigationService.Navigated -= this.OnNavigated;
NavigationService.Navigated -= OnNavigated;
}
private void OnNavigated(object sender, NavigationEventArgs e)
@@ -81,42 +85,42 @@ namespace Microsoft.PowerToys.Settings.UI.Behaviors
var frame = sender as Frame;
if (frame.Content is Page page)
{
this.currentPage = page;
currentPage = page;
this.UpdateHeader();
this.UpdateHeaderTemplate();
UpdateHeader();
UpdateHeaderTemplate();
}
}
private void UpdateHeader()
{
if (this.currentPage != null)
if (currentPage != null)
{
var headerMode = GetHeaderMode(this.currentPage);
var headerMode = GetHeaderMode(currentPage);
if (headerMode == NavigationViewHeaderMode.Never)
{
this.AssociatedObject.Header = null;
this.AssociatedObject.AlwaysShowHeader = false;
AssociatedObject.Header = null;
AssociatedObject.AlwaysShowHeader = false;
}
else
{
var headerFromPage = GetHeaderContext(this.currentPage);
var headerFromPage = GetHeaderContext(currentPage);
if (headerFromPage != null)
{
this.AssociatedObject.Header = headerFromPage;
AssociatedObject.Header = headerFromPage;
}
else
{
this.AssociatedObject.Header = this.DefaultHeader;
AssociatedObject.Header = DefaultHeader;
}
if (headerMode == NavigationViewHeaderMode.Always)
{
this.AssociatedObject.AlwaysShowHeader = true;
AssociatedObject.AlwaysShowHeader = true;
}
else
{
this.AssociatedObject.AlwaysShowHeader = false;
AssociatedObject.AlwaysShowHeader = false;
}
}
}
@@ -124,10 +128,10 @@ namespace Microsoft.PowerToys.Settings.UI.Behaviors
private void UpdateHeaderTemplate()
{
if (this.currentPage != null)
if (currentPage != null)
{
var headerTemplate = GetHeaderTemplate(this.currentPage);
this.AssociatedObject.HeaderTemplate = headerTemplate ?? this.DefaultHeaderTemplate;
var headerTemplate = GetHeaderTemplate(currentPage);
AssociatedObject.HeaderTemplate = headerTemplate ?? DefaultHeaderTemplate;
}
}
}

6
src/core/Microsoft.PowerToys.Settings.UI/Behaviors/NavigationViewHeaderMode.cs
View File

@@ -1,4 +1,8 @@
namespace Microsoft.PowerToys.Settings.UI.Behaviors
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.PowerToys.Settings.UI.Behaviors
{
public enum NavigationViewHeaderMode
{