maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fx cop for Fz Editor part2 (#11293)

Browse source 
* disposable not being disposed

* CA1305 fixes

Co-authored-by: crutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas 2021-05-18 04:39:38 -07:00 committed by GitHub
parent 58d41d40e5
commit f29b8dc50c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/modules/fancyzones/editor/FancyZonesEditor/App.xaml.cs
View file

@ -21,7 +21,7 @@ namespace FancyZonesEditor
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
public partial class App : Application, IDisposable
{
// Non-localizable strings
private const string CrashReportLogFile = "FZEditorCrashLog.txt";
@ -66,6 +66,7 @@ namespace FancyZonesEditor
}
private static bool _debugMode;
private bool _isDisposed;
[Conditional("DEBUG")]
private void DebugModeCheck()
@ -290,5 +291,27 @@ namespace FancyZonesEditor
return sb.ToString();
}
protected virtual void Dispose(bool disposing)
{
if (!_isDisposed)
{
if (disposing)
{
_themeManager?.Dispose();
}
// TODO: free unmanaged resources (unmanaged objects) and override finalizer
// TODO: set large fields to null
_isDisposed = true;
}
}
public void Dispose()
{
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
Dispose(disposing: true);
GC.SuppressFinalize(this);
}
}
}

6
src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml.cs
View file

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@ -29,8 +30,9 @@ namespace FancyZonesEditor
private void CanvasZone_SizeChanged(object sender, SizeChangedEventArgs e)
{
WidthLabel.Text = Width.ToString();
HeightLabel.Text = Height.ToString();
// using current culture as this is end user facing
WidthLabel.Text = Width.ToString(CultureInfo.CurrentCulture);
HeightLabel.Text = Height.ToString(CultureInfo.CurrentCulture);
}
private CanvasLayoutModel model;

6
src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml.cs
View file

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.
using System;
using System.Globalization;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@ -82,8 +83,9 @@ namespace FancyZonesEditor
private void GridZone_SizeChanged(object sender, SizeChangedEventArgs e)
{
WidthLabel.Text = Math.Round(ActualWidth).ToString();
HeightLabel.Text = Math.Round(ActualHeight).ToString();
// using current culture as this is end user facing
WidthLabel.Text = Math.Round(ActualWidth).ToString(CultureInfo.CurrentCulture);
HeightLabel.Text = Math.Round(ActualHeight).ToString(CultureInfo.CurrentCulture);
}
public void UpdateShiftState(bool shiftState)

29
src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs
View file

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.IO.Abstractions;
using System.Text;
@ -74,15 +75,16 @@ namespace FancyZonesEditor.Utils
{
var sb = new StringBuilder();
// using CultureInfo.InvariantCulture since this is internal data
sb.Append("ID: ");
sb.AppendLine(MonitorId);
sb.Append("DPI: ");
sb.AppendLine(Dpi.ToString());
sb.AppendLine(Dpi.ToString(CultureInfo.InvariantCulture));
sb.Append("X: ");
sb.AppendLine(LeftCoordinate.ToString());
sb.AppendLine(LeftCoordinate.ToString(CultureInfo.InvariantCulture));
sb.Append("Y: ");
sb.AppendLine(TopCoordinate.ToString());
sb.AppendLine(TopCoordinate.ToString(CultureInfo.InvariantCulture));
return sb.ToString();
}
@ -259,14 +261,15 @@ namespace FancyZonesEditor.Utils
* (7) monitor left
* (8) monitor top
* ...
* Using CultureInfo.InvariantCulture since this is us parsing our own data
*/
var argsParts = args[1].Split('/');
// Process ID
App.PowerToysPID = int.Parse(argsParts[(int)CmdArgs.PowerToysPID]);
App.PowerToysPID = int.Parse(argsParts[(int)CmdArgs.PowerToysPID], CultureInfo.InvariantCulture);
// Span zones across monitors
App.Overlay.SpanZonesAcrossMonitors = int.Parse(argsParts[(int)CmdArgs.SpanZones]) == 1;
App.Overlay.SpanZonesAcrossMonitors = int.Parse(argsParts[(int)CmdArgs.SpanZones], CultureInfo.InvariantCulture) == 1;
// Target monitor id
string targetMonitorName = argsParts[(int)CmdArgs.TargetMonitorId];
@ -281,7 +284,7 @@ namespace FancyZonesEditor.Utils
}
// Monitors count
int count = int.Parse(argsParts[(int)CmdArgs.MonitorsCount]);
int count = int.Parse(argsParts[(int)CmdArgs.MonitorsCount], CultureInfo.InvariantCulture);
if (count != App.Overlay.DesktopsCount && !isCustomMonitorConfigurationMode)
{
MessageBox.Show(Properties.Resources.Error_Invalid_Arguments, Properties.Resources.Error_Message_Box_Title);
@ -298,9 +301,9 @@ namespace FancyZonesEditor.Utils
{
var nativeData = default(NativeMonitorData);
nativeData.MonitorId = argsParts[(int)CmdArgs.MonitorId + (i * monitorArgsCount)];
nativeData.Dpi = int.Parse(argsParts[(int)CmdArgs.DPI + (i * monitorArgsCount)]);
nativeData.LeftCoordinate = int.Parse(argsParts[(int)CmdArgs.MonitorLeft + (i * monitorArgsCount)]);
nativeData.TopCoordinate = int.Parse(argsParts[(int)CmdArgs.MonitorTop + (i * monitorArgsCount)]);
nativeData.Dpi = int.Parse(argsParts[(int)CmdArgs.DPI + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeData.LeftCoordinate = int.Parse(argsParts[(int)CmdArgs.MonitorLeft + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeData.TopCoordinate = int.Parse(argsParts[(int)CmdArgs.MonitorTop + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeMonitorData.Add(nativeData);
@ -325,8 +328,8 @@ namespace FancyZonesEditor.Utils
foreach (NativeMonitorData nativeData in nativeMonitorData)
{
var splittedId = nativeData.MonitorId.Split('_');
int width = int.Parse(splittedId[1]);
int height = int.Parse(splittedId[2]);
int width = int.Parse(splittedId[1], CultureInfo.InvariantCulture);
int height = int.Parse(splittedId[2], CultureInfo.InvariantCulture);
Rect bounds = new Rect(nativeData.LeftCoordinate, nativeData.TopCoordinate, width, height);
bool isPrimary = nativeData.LeftCoordinate == 0 && nativeData.TopCoordinate == 0;
@ -1020,8 +1023,10 @@ namespace FancyZonesEditor.Utils
sb.Append("Span zones across monitors: ");
sb.AppendLine(App.Overlay.SpanZonesAcrossMonitors.ToString());
// using CultureInfo.InvariantCulture since this is for PowerToys team
sb.Append("Monitors count: ");
sb.AppendLine(count.ToString());
sb.AppendLine(count.ToString(CultureInfo.InvariantCulture));
sb.Append("Target monitor: ");
sb.AppendLine(targetMonitorName);