Changeset 10691

Timestamp:

2005-10-05T15:54:53+13:00 (18 years ago)

Author:

kjdon

Message:

fixed up the folder selection highlighting (cue lines) - the lines now disappear if the mouse is dragged off the folder

File:

• trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -300 +300 @@
         g2.drawImage(group.image_ghost, AffineTransform.getTranslateInstance(ra_ghost.getX(), ra_ghost.getY()), null);
     }
-    // Now we highlight the target node if it is a valid drop target. Of course we don't bother if we are still over a node which has already been identified as to whether its a drop target.
+    // Now we highlight the target node if it is a valid drop target. Of course we don't bother if we are still over a node which has already been identified as to whether its a drop target
     TreePath target_path = this.getPathForLocation(pt.x, pt.y);
+    
+    if (target_path == null) {
+        // the user has moved the mouse into background area - need to remove any existing cue lines
+        if(upper_cue_line != null && lower_cue_line != null) {
+        paintImmediately(upper_cue_line.getBounds());
+        paintImmediately(lower_cue_line.getBounds());
+        previous_path = null;
+        }
+        // don't need to display anything
+        return;
+    } 
+    
     if(previous_path == null || target_path != null && !target_path.equals(previous_path)) {
         // Immediately clear the old cue lines.
@@ -309 +321 @@
         }
         if(isValidDrop(target_path)) {
-        ///ystem.err.println("Valid. Painting cues.");
         // Get the drop target's bounding rectangle
         Rectangle raPath = getPathBounds(target_path);
         // Cue line bounds (2 pixels beneath the drop target)
-        upper_cue_line = new Rectangle(0,  raPath.y + (int)raPath.getHeight(), getWidth(), 2);
-        lower_cue_line = new Rectangle(0,  raPath.y, getWidth(), 2);
+        upper_cue_line = new Rectangle(0, raPath.y + (int)raPath.getHeight(), getWidth(), 2);
+        lower_cue_line = new Rectangle(0, raPath.y, getWidth(), 2);
         g2.setColor(((DefaultTreeCellRenderer)cellRenderer).getBackgroundSelectionColor()); // The cue line color
         g2.fill(upper_cue_line);         // Draw the cue line
@@ -644 +655 @@
     private boolean isValidDrop(TreePath target_path) {
     boolean valid = false;
-    if(target_path != null) {
+    if(target_path == null) {
+        previous_path = null;
+    } 
+    else {
         FileNode target_node = (FileNode) target_path.getLastPathComponent();
         // We can only continue testing if the node is a folder.
@@ -673 +687 @@
         previous_path = target_path;
     }
-    else {
-        if(target_path == null) {
-        previous_path = null;
-        }
-    }
     return valid;
     }