Changeset 9921 for trunk

Timestamp:

09/02/13 13:38:07 (11 years ago)

Author:

ascheibe

Message:

#2100 improved handling of position of help label

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -104 +104 @@
           configurationLabel.Enabled = activeView != null && !activeView.Locked;
 
-          if (activeView != null && ViewAttribute.HasHelpResourcePath(activeView.GetType())) {
-            if (configurationLabel.Visible) {
-              helpLabel.Top = 44;
-            } else {
-              helpLabel.Top = 22;
-            }
-            helpLabel.Visible = true;
-          } else {
-            helpLabel.Visible = false;
-            helpLabel.Top = 44;
-          }
+          helpLabel.Visible = activeView != null && ViewAttribute.HasHelpResourcePath(activeView.GetType());
+          helpLabel.Top = CalculateHelpLabelPosY();
         }
       }
@@ -222 +213 @@
       viewsLabel.Location = new Point(Width - viewsLabel.Margin.Right - viewsLabel.Width, viewsLabel.Margin.Top);
       configurationLabel.Location = new Point(Width - configurationLabel.Margin.Right - configurationLabel.Width, viewsLabel.Bottom + viewsLabel.Margin.Bottom + configurationLabel.Margin.Top);
-
+      helpLabel.Location = new Point(Width - helpLabel.Margin.Right - helpLabel.Width, CalculateHelpLabelPosY());
+    }
+
+    private int CalculateHelpLabelPosY() {
+      if (activeView != null && ViewAttribute.HasHelpResourcePath(activeView.GetType()) && !configurationLabel.Visible) {
+        return configurationLabel.Top;
+      }
+      return configurationLabel.Bottom + configurationLabel.Margin.Bottom + helpLabel.Margin.Top;
     }