Skip to content

[FZ Editor] Duplicate layout behavior #8720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SeraphimaZykova merged 1 commit into from
Dec 24, 2020
Merged

[FZ Editor] Duplicate layout behavior #8720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public partial class MainWindow : Window

private readonly MainWindowSettingsModel _settings = ((App)Application.Current).MainWindowSettings;

// Localizable string
private static readonly string _defaultNamePrefix = "Custom Layout ";

public int WrapPanelItemSize { get; set; } = DefaultWrapPanelItemSize;

public MainWindow(bool spanZonesAcrossMonitors, Rect workArea)
Expand Down Expand Up @@ -139,31 +136,45 @@ private void DuplicateLayout_Click(object sender, RoutedEventArgs e)

model.IsSelected = false;

Hide();

// make a copy
model = model.Clone();
mainEditor.CurrentDataContext = model;

string name = model.Name;
var index = name.LastIndexOf('(');
if (index != -1)
{
name = name.Remove(index);
name = name.TrimEnd();
}

int maxCustomIndex = 0;
foreach (LayoutModel customModel in MainWindowSettingsModel.CustomModels)
{
string name = customModel.Name;
if (name.StartsWith(_defaultNamePrefix))
string customModelName = customModel.Name;
if (customModelName.StartsWith(name))
{
if (int.TryParse(name.Substring(_defaultNamePrefix.Length), out int i))
int openBraceIndex = customModelName.LastIndexOf('(');
int closeBraceIndex = customModelName.LastIndexOf(')');
if (openBraceIndex != -1 && closeBraceIndex != -1)
{
if (maxCustomIndex < i)
string indexSubstring = customModelName.Substring(openBraceIndex + 1, closeBraceIndex - openBraceIndex - 1);

if (int.TryParse(indexSubstring, out int i))
{
maxCustomIndex = i;
if (maxCustomIndex < i)
{
maxCustomIndex = i;
}
}
}
}
}

model.Name = _defaultNamePrefix + (++maxCustomIndex);
model.Name = name + " (" + (++maxCustomIndex) + ')';

mainEditor.OpenEditor(model);
model.Persist();
App.FancyZonesEditorIO.SerializeZoneSettings();
}

private void Apply_Click(object sender, RoutedEventArgs e)
Expand Down