Changeset 13763 for branches/HeuristicLab.Visualization

Timestamp:

04/14/16 14:30:23 (9 years ago)

Author:

jkarder

Message:

#1265: worked on visualization

• added null check for shortcut actions

Location:

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3

Files:

• ChartControl.cs (modified) (2 diffs)
• ChartMode.cs (modified) (2 diffs)

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/ChartControl.cs

@@ -229 +229 @@
           if (e.KeyCode == shortcut.Key && e.Modifiers == shortcut.Modifiers) {
             ActiveShortcut = shortcut;
-            shortcut.DownAction();
+            var downAction = shortcut.DownAction;
+            if (downAction != null) downAction();
             break;
           }
@@ -247 +248 @@
 
         if (ActiveShortcut.Key == e.KeyCode || ActiveShortcut.GetModifiers().Except(modifiers).Any()) {
-          ActiveShortcut.UpAction();
+          var upAction = ActiveShortcut.UpAction;
+          if (upAction != null) upAction();
           ActiveShortcut = null;
         }

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/ChartMode.cs

@@ -86 +86 @@
         if (e.KeyCode == shortcut.Key && e.Modifiers == shortcut.Modifiers) {
           activeShortcut = shortcut;
-          shortcut.DownAction();
+          var downAction = shortcut.DownAction;
+          if (downAction != null) downAction();
           break;
         }
@@ -100 +101 @@
 
       if (activeShortcut.Key == e.KeyCode || activeShortcut.GetModifiers().Except(modifiers).Any()) {
-        activeShortcut.UpAction();
+        var upAction = activeShortcut.UpAction;
+        if (upAction != null) upAction();
         activeShortcut = null;
       }