Changeset 7141

Timestamp:

2004-03-29T15:25:59+12:00 (20 years ago)

Author:

kjdon

Message:

added in a left click on a folder handler: if the folder is closed, then move the focus to the parent folder. Note that this was a bit trickier than expected because there is another mysterious handler that does left and right clicks to close and open folders. I needed to test for left click on a closed folder on the key pressed, but actually action it on the key release other wise the other handler comes into play and you get two actions happening on a single click.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java

@@ -1037 +1037 @@
     private class KeyListenerImpl
     extends KeyAdapter {
+    private boolean vk_left_pressed = false;
     /** Called whenever a key that was pressed is released, it is this action that will cause the desired effects (this allows for the key event itself to be processed prior to this listener dealing with it). */
     public void keyReleased(KeyEvent event) {
@@ -1064 +1065 @@
         if(path != null) {
             File file = ((FileNode)path.getLastPathComponent()).getFile();
-            if(file != null && file.isFile()) {
-            TreePath parent_path = path.getParentPath();
-            if (parent_path != null && parent_path.getParentPath() != null) {
-                // if this file is in the top level folder, don't move the focus 
-                tree.setImmediate(true);
-                tree.clearSelection();
-                tree.setSelectionPath(parent_path);
-                tree.setImmediate(false);
+            if(file != null) {
+            if (file.isFile() || vk_left_pressed) {
+                vk_left_pressed = false;
+                TreePath parent_path = path.getParentPath();
+                if (parent_path != null && parent_path.getParentPath() != null) {
+                // if this file is in the top level folder, don't move the focus 
+                tree.setImmediate(true);
+                tree.clearSelection();
+                tree.setSelectionPath(parent_path);
+                tree.setImmediate(false);
+                }
             }
             }
         }
+        }       
+    }
+
+    // we need to watch for left clicks on an unopened folder - should shift the focus to teh parent folder. But because there is some other mysterious key listener that does opening and closing folders on right and left clicks, we must detect the situation before the other handler has done its job, and process it after. 
+    public void keyPressed(KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.VK_LEFT) {
+        // left key on  closed directory shifts the selection to the parent folder
+        DragTree tree = (DragTree)event.getSource();
+        TreePath path = tree.getLeadSelectionPath();
+        if(path == null) return; 
+        File file = ((FileNode)path.getLastPathComponent()).getFile();
+        if(file == null) return;
+        
+        if (file.isDirectory() && tree.isCollapsed(path)) {
+            vk_left_pressed = true;
+        }       
         }
     }