Added default custom layout name (#9291)

microsoft · Jan 27, 2021 · 37b6876 · 37b6876
1 parent 1680b00
commit 37b6876
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -129,7 +129,24 @@ private void Select(LayoutModel newSelection)
 
         private async void NewLayoutButton_Click(object sender, RoutedEventArgs e)
         {
-            LayoutNameText.Text = string.Empty;
+            string defaultNamePrefix = FancyZonesEditor.Properties.Resources.Default_Custom_Layout_Name;
+            int maxCustomIndex = 0;
+            foreach (LayoutModel customModel in MainWindowSettingsModel.CustomModels)
+            {
+                string name = customModel.Name;
+                if (name.StartsWith(defaultNamePrefix))
+                {
+                    if (int.TryParse(name.Substring(defaultNamePrefix.Length), out int i))
+                    {
+                        if (maxCustomIndex < i)
+                        {
+                            maxCustomIndex = i;
+                        }
+                    }
+                }
+            }
+
+            LayoutNameText.Text = defaultNamePrefix + " " + (++maxCustomIndex);
             GridLayoutRadioButton.IsChecked = true;
             GridLayoutRadioButton.Focus();
             await NewLayoutDialog.ShowAsync();

diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
@@ -331,4 +331,7 @@ To merge zones, select the zones and click "merge".</value>
   <data name="Create_Custom_From_Template" xml:space="preserve">
     <value>Create custom layout</value>
   </data>
+  <data name="Default_Custom_Layout_Name" xml:space="preserve">
+    <value>Custom layout</value>
+  </data>
 </root>