diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2016-06-27 23:16:17 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2016-06-27 23:16:17 +0300 |
| commit | 3d7130be96c3bf8a84cd6092b1a26e055707d630 (patch) | |
| tree | 97ee34bf667ee3e63e5ac554d7c7dcdb64cc1a1a /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs | |
| parent | c7606a74ffebf93da4967b053f154a37cf8a5ca7 (diff) | |
| parent | 8c955ef9100378f8d2a5d7a83031c93aa43dec35 (diff) | |
Merge remote-tracking branch 'origin/master' into run-configurations
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs | 7 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs index 938bd2991c..bfb46c7055 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs @@ -18,8 +18,11 @@ namespace MonoDevelop.Ide.Gui.Dialogs public NewLayoutDialog () { Build (); - - existingLayouts = IdeApp.Workbench.Layouts; + + existingLayouts = IdeApp.Workbench.Layouts.ToList (); + foreach (var mapping in Commands.LayoutListHandler.NameMapping) + if (existingLayouts.Contains (mapping.Key)) + existingLayouts.Add (mapping.Value); layoutName.Changed += OnNameChanged; OnNameChanged (layoutName, EventArgs.Empty); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs index e749035dee..5811a86f9a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs @@ -424,6 +424,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs TreeIter cit; if (removeEmptySections && page.Panels.Count == 0 && !store.IterChildren (out cit, it)) { store.Remove (ref it); + pages.Remove (section); return TreeIter.Zero; } return it; |