X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjexer%2FTTreeItem.java;h=e6bf2790f8c2b584d89e8040ccba786c1a62579c;hb=329fd62e4acdaa8e9f4cccd518d47c0b07e79f51;hp=e97ea0eb5aa641a4bd818033c6074136d5d0e671;hpb=7668cb45fd91775da14504919d8a239af2f7c07e;p=fanfix.git

diff --git a/src/jexer/TTreeItem.java b/src/jexer/TTreeItem.java
index e97ea0e..e6bf279 100644
--- a/src/jexer/TTreeItem.java
+++ b/src/jexer/TTreeItem.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
  * License: LGPLv3 or later
@@ -76,7 +76,7 @@ public class TTreeItem extends TWidget {
     /**
      * Set the displayable text for this item.
      *
-     * @param the displayable text for this item
+     * @param text the displayable text for this item
      */
     public final void setText(final String text) {
         this.text = text;
@@ -101,7 +101,7 @@ public class TTreeItem extends TWidget {
      *
      * @param expanded new value
      */
-    public final void setExpanded(boolean expanded) {
+    public final void setExpanded(final boolean expanded) {
         this.expanded = expanded;
     }
 
@@ -124,7 +124,7 @@ public class TTreeItem extends TWidget {
      *
      * @param expandable new value
      */
-    public final void setExpandable(boolean expandable) {
+    public final void setExpandable(final boolean expandable) {
         this.expandable = expandable;
     }
 
@@ -162,7 +162,7 @@ public class TTreeItem extends TWidget {
      *
      * @param invisible new value
      */
-    public final void setInvisible(boolean invisible) {
+    public final void setInvisible(final boolean invisible) {
         this.invisible = invisible;
     }
 
@@ -185,7 +185,7 @@ public class TTreeItem extends TWidget {
      *
      * @param selected new value
      */
-    public final void setSelected(boolean selected) {
+    public final void setSelected(final boolean selected) {
         this.selected = selected;
     }
 
@@ -199,10 +199,22 @@ public class TTreeItem extends TWidget {
      *
      * @param selectable new value
      */
-    public final void setSelectable(boolean selectable) {
+    public final void setSelectable(final boolean selectable) {
         this.selectable = selectable;
     }
 
+    /**
+     * Pointer to the previous keyboard-navigable item (kbUp).  Note package
+     * private access.
+     */
+    TTreeItem keyboardPrevious = null;
+
+    /**
+     * Pointer to the next keyboard-navigable item (kbDown).  Note package
+     * private access.
+     */
+    TTreeItem keyboardNext = null;
+
     /**
      * Public constructor.
      *
@@ -253,10 +265,10 @@ public class TTreeItem extends TWidget {
     /**
      * Recursively expand the tree into a linear array of items.
      *
-     * @param prefix = vertical bar of parent levels and such that is set on
+     * @param prefix vertical bar of parent levels and such that is set on
      * each child
-     * @param last = if true, this is the "last" leaf node of a tree
-     * @param additional items to add to the array
+     * @param last if true, this is the "last" leaf node of a tree
+     * @return additional items to add to the array
      */
     public List<TTreeItem> expandTree(final String prefix, final boolean last) {
         List<TTreeItem> array = new ArrayList<TTreeItem>();
@@ -264,7 +276,7 @@ public class TTreeItem extends TWidget {
         this.prefix = prefix;
         array.add(this);
 
-        if ((getChildren().size() == 0) || (expanded == false)) {
+        if ((getChildren().size() == 0) || !expanded) {
             return array;
         }
 
@@ -323,7 +335,7 @@ public class TTreeItem extends TWidget {
      */
     @Override
     public void onMouseUp(final TMouseEvent mouse) {
-        if ((mouse.getX() == (getExpanderX() - view.hScroller.getValue()))
+        if ((mouse.getX() == (getExpanderX() - view.getHScroller().getValue()))
             && (mouse.getY() == 0)
         ) {
             if (selectable) {
@@ -356,6 +368,34 @@ public class TTreeItem extends TWidget {
         }
     }
 
+    /**
+     * Handle keystrokes.
+     *
+     * @param keypress keystroke event
+     */
+    @Override
+    public void onKeypress(final TKeypressEvent keypress) {
+        if (keypress.equals(kbLeft)
+            || keypress.equals(kbRight)
+            || keypress.equals(kbSpace)
+        ) {
+            if (selectable) {
+                // Flip expanded flag
+                expanded = !expanded;
+                if (expanded == false) {
+                    // Unselect children that became invisible
+                    unselect();
+                }
+                view.setSelected(this);
+            }
+            // Let subclasses do something with this
+            onExpand();
+        } else {
+            // Pass other keys (tab etc.) on to TWidget's handler.
+            super.onKeypress(keypress);
+        }
+    }
+
     /**
      * Draw this item to a window.
      */
@@ -365,7 +405,7 @@ public class TTreeItem extends TWidget {
             return;
         }
 
-        int offset = -view.hScroller.getValue();
+        int offset = -view.getHScroller().getValue();
 
         CellAttributes color = getTheme().getColor("ttreeview");
         CellAttributes textColor = getTheme().getColor("ttreeview");
@@ -384,7 +424,6 @@ public class TTreeItem extends TWidget {
         // Blank out the background
         getScreen().hLineXY(0, 0, getWidth(), ' ', color);
 
-        int expandX = 0;
         String line = prefix;
         if (level > 0) {
             if (last) {
@@ -397,12 +436,12 @@ public class TTreeItem extends TWidget {
                 line += "[ ] ";
             }
         }
-        getScreen().putStrXY(offset, 0, line, color);
+        getScreen().putStringXY(offset, 0, line, color);
         if (selected) {
-            getScreen().putStrXY(offset + line.length(), 0, text,
+            getScreen().putStringXY(offset + line.length(), 0, text,
                 selectedColor);
         } else {
-            getScreen().putStrXY(offset + line.length(), 0, text, textColor);
+            getScreen().putStringXY(offset + line.length(), 0, text, textColor);
         }
         if ((level > 0) && (expandable)) {
             if (expanded) {