Changeset 17569 for branches

Timestamp:

05/28/20 16:16:12 (4 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into branch.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/ItemView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Core.Views/3.3/ItemView.cs

@@ -45 +45 @@
 
       if (CountParentControls() > Properties.Settings.Default.MaximumNestedControls) {
-        //capture content, needed because it is set at a later time
-        NestingLevelErrorControl errorControl = new NestingLevelErrorControl(() => Content, this.GetType());
+        var errorControl = new NestingLevelErrorControl();
         errorControl.Dock = DockStyle.Fill;
 

branches/2521_ProblemRefactoring/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Windows.Forms;
-using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Core.Views {
   public partial class NestingLevelErrorControl : UserControl {
-    private Func<IContent> Content { get; set; }
-    private Type ViewType { get; set; }
-
-    public NestingLevelErrorControl(Func<IContent> content, Type viewType)
-      : base() {
+    public NestingLevelErrorControl() : base() {
       InitializeComponent();
-      Content = content;
-      ViewType = viewType;
     }
 
+    private IContentView SurroundingView => (IContentView)Parent;
+
     private void showButton_Click(object sender, System.EventArgs e) {
-      if (Content != null && ViewType != null) {
-        MainFormManager.MainForm.ShowContent(Content(), ViewType);
-      }
+      if (SurroundingView == null) return;
+      if (SurroundingView.Content == null) return;
+
+      var view = MainFormManager.MainForm.ShowContent(SurroundingView.Content, SurroundingView.GetType());
+      view.ReadOnly = SurroundingView.ReadOnly;
+      view.Locked = SurroundingView.Locked;
     }
   }