Bug fix: focus now visible

Only add a focus traversal manager when TypeBlockManager is enabled. This will avoid the focus to be shown per default.
mikaelhg · Nov 8, 2011 · 2849ab7 · 2849ab7
1 parent 284819f
commit 2849ab7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/edu/mit/blocks/workspace/Workspace.java b/src/main/java/edu/mit/blocks/workspace/Workspace.java
@@ -110,7 +110,7 @@ public int compare(WorkspaceWidget w1, WorkspaceWidget w2) {
      */
     private MiniMap miniMap;
     private FactoryManager factory;
-    private FocusTraversalManager focusManager;
+    private final FocusTraversalManager focusManager;
 
     private final TypeBlockManager typeBlockManager;
 

diff --git a/src/main/java/edu/mit/blocks/workspace/typeblocking/TypeBlockManager.java b/src/main/java/edu/mit/blocks/workspace/typeblocking/TypeBlockManager.java
@@ -67,9 +67,6 @@ public TypeBlockManager(Workspace workspace, BlockCanvas component) {
         this.autoCompletePanel = new AutoCompletePanel(workspace);
         this.blockCanvas = component;
         this.focusManager = workspace.getFocusManager();
-        blockCanvas.getCanvas().addMouseListener(focusManager);
-        blockCanvas.getCanvas().addKeyListener(focusManager);
-        workspace.addWorkspaceListener(this.focusManager);
     }
 
     /**
@@ -78,6 +75,16 @@ public TypeBlockManager(Workspace workspace, BlockCanvas component) {
      */
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
+        if (enabled) {
+            blockCanvas.getCanvas().addMouseListener(focusManager);
+            blockCanvas.getCanvas().addKeyListener(focusManager);
+            workspace.addWorkspaceListener(focusManager);
+        }
+        else {
+            blockCanvas.getCanvas().removeMouseListener(focusManager);
+            blockCanvas.getCanvas().removeKeyListener(focusManager);
+            workspace.removeWorkspaceListener(focusManager);
+        }
     }
 
     /**