From 9e4752b11490326d7d233b7242819d7b13f46a2e Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Thu, 12 Dec 2019 13:34:06 -0800 Subject: [PATCH] fix line issues --- .../FancyZonesEditor/GridEditor.xaml.cs | 2 ++ .../Models/CanvasLayoutModel.cs | 1 + .../Models/GridLayoutModel.cs | 2 ++ .../Properties/AssemblyInfo.cs | 32 +++++++++---------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs index 469c22b8db..84ddd69052 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs @@ -271,6 +271,7 @@ namespace FancyZonesEditor if (_colInfo[foundCol + i].End == offset) { foundExistingSplit = true; + // use existing division } } @@ -364,6 +365,7 @@ namespace FancyZonesEditor if (_rowInfo[foundRow + i].End == offset) { foundExistingSplit = true; + // use existing division } } diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs index 6e3724bccd..e0bba1a312 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs @@ -139,6 +139,7 @@ namespace FancyZonesEditor.Models data[i++] = 1; // LayoutModelType: 1 == CanvasLayoutModel data[i++] = (byte)(Id / 256); data[i++] = (byte)(Id % 256); + // End common data[i++] = (byte)(_referenceWidth / 256); diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs index 9a652c9224..e71657e390 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs @@ -192,12 +192,14 @@ namespace FancyZonesEditor.Models byte[] data = new byte[7 + (Rows * 2) + (Columns * 2) + (Rows * Columns)]; int i = 0; + // Common persisted values between all layout types data[i++] = (byte)(c_latestVersion / 256); data[i++] = (byte)(c_latestVersion % 256); data[i++] = 0; // LayoutModelType: 0 == GridLayoutModel data[i++] = (byte)(Id / 256); data[i++] = (byte)(Id % 256); + // End common data[i++] = (byte)Rows; diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs index 190f6d51e7..a85b8eb41c 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs @@ -23,25 +23,23 @@ using System.Windows; // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - +// In order to begin building localizable applications, set +// CultureYouAreCodingWith in your .csproj file +// inside a . For example, if you are using US english +// in your source files, set the to en-US. Then uncomment +// the NeutralResourceLanguage attribute below. Update the "en-US" in +// the line below to match the UICulture setting in the project file. +// [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] +// ThemeInfo.None = where theme specific resource dictionaries are located +// (used if a resource is not found in the page, +// or application resource dictionaries) +// ThemeInfo.SourceAssembly = where the generic resource dictionary is located +// (used if a resource is not found in the page, +// app, or any theme specific resource dictionaries) [assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - + ResourceDictionaryLocation.None, + ResourceDictionaryLocation.SourceAssembly)] // Version information for an assembly consists of the following four values: //