Changeset 8860

Timestamp:

10/30/12 12:54:50 (11 years ago)

Author:

jkarder

Message:

#1747: fixed panning with the middle mouse button

File:

• trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs

@@ -154 +154 @@
 
     void ParentControl_MouseDown(object sender, MouseEventArgs e) {
-      lastActiveTool = this.graphVisualizationInfoView.Controller.ActiveTool;
       if (e.Button == MouseButtons.Middle) {
-        if (!(lastActiveTool is CustomPanTool)) this.graphVisualizationInfoView.Controller.ActivateTool(CustomPanTool.ToolName);
+        lastActiveTool = graphVisualizationInfoView.Controller.ActiveTool;
+        graphVisualizationInfoView.Controller.ActivateTool(CustomPanTool.ToolName);
       }
     }
@@ -162 +162 @@
     void ParentControl_MouseUp(object sender, MouseEventArgs e) {
       if (e.Button == MouseButtons.Middle) {
-        if (lastActiveTool != null) this.graphVisualizationInfoView.Controller.ActivateTool(lastActiveTool.Name);
-        else this.graphVisualizationInfoView.Controller.DeactivateAllTools();
+        var activeTool = graphVisualizationInfoView.Controller.ActiveTool;
+        graphVisualizationInfoView.Controller.DeactivateTool(activeTool);
+        if (lastActiveTool != null && !(lastActiveTool is ZoomToolBase))
+          graphVisualizationInfoView.Controller.ActivateTool(lastActiveTool.Name);
       }
     }