Merge branch 'subtree'

[fanfix.git] / src / jexer / TRadioButton.java

diff --git a/src/jexer/TRadioButton.java b/src/jexer/TRadioButton.java
index e3d98a985329a52dfbd18769212045e8561b68d8..dcc5c13699f03fefceabbc54bf65bac1b6624745 100644 (file)
--- a/src/jexer/TRadioButton.java
+++ b/src/jexer/TRadioButton.java
@@ -31,6 +31,7 @@ package jexer;
 import jexer.bits.CellAttributes;
 import jexer.bits.GraphicsChars;
 import jexer.bits.MnemonicString;
+import jexer.bits.StringUtils;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
 import static jexer.TKeypress.*;
@@ -49,9 +50,9 @@ public class TRadioButton extends TWidget {
     // ------------------------------------------------------------------------
 
     /**
-     * RadioButton state, true means selected.
+     * RadioButton state, true means selected.  Note package private access.
      */
-    private boolean selected = false;
+    boolean selected = false;
 
     /**
      * The shortcut and radio button label.
@@ -60,16 +61,16 @@ public class TRadioButton extends TWidget {
 
     /**
      * ID for this radio button.  Buttons start counting at 1 in the
-     * RadioGroup.
+     * RadioGroup.  Note package private access.
      */
-    private int id;
+    int id;
 
     // ------------------------------------------------------------------------
     // Constructors -----------------------------------------------------------
     // ------------------------------------------------------------------------
 
     /**
-     * Public constructor.
+     * Package private constructor.
      *
      * @param parent parent widget
      * @param x column relative to parent
@@ -77,17 +78,19 @@ public class TRadioButton extends TWidget {
      * @param label label to display next to (right of) the radiobutton
      * @param id ID for this radio button
      */
-    public TRadioButton(final TRadioGroup parent, final int x, final int y,
+    TRadioButton(final TRadioGroup parent, final int x, final int y,
         final String label, final int id) {
 
         // Set parent and window
-        super(parent, x, y, label.length() + 4, 1);
+        super(parent, x, y, StringUtils.width(label) + 4, 1);
 
         mnemonic = new MnemonicString(label);
         this.id = id;
 
         setCursorVisible(true);
         setCursorX(1);
+
+        parent.addRadioButton(this);
     }
 
     // ------------------------------------------------------------------------
@@ -119,8 +122,7 @@ public class TRadioButton extends TWidget {
     public void onMouseDown(final TMouseEvent mouse) {
         if ((mouseOnRadioButton(mouse)) && (mouse.isMouse1())) {
             // Switch state
-            selected = true;
-            ((TRadioGroup) getParent()).setSelected(this);
+            ((TRadioGroup) getParent()).setSelected(id);
         }
     }
 
@@ -133,8 +135,7 @@ public class TRadioButton extends TWidget {
     public void onKeypress(final TKeypressEvent keypress) {
 
         if (keypress.equals(kbSpace)) {
-            selected = true;
-            ((TRadioGroup) getParent()).setSelected(this);
+            ((TRadioGroup) getParent()).setSelected(id);
             return;
         }
 
@@ -155,6 +156,27 @@ public class TRadioButton extends TWidget {
     // TWidget ----------------------------------------------------------------
     // ------------------------------------------------------------------------
 
+    /**
+     * Override TWidget's width: we can only set width at construction time.
+     *
+     * @param width new widget width (ignored)
+     */
+    @Override
+    public void setWidth(final int width) {
+        // Do nothing
+    }
+
+    /**
+     * Override TWidget's height: we can only set height at construction
+     * time.
+     *
+     * @param height new widget height (ignored)
+     */
+    @Override
+    public void setHeight(final int height) {
+        // Do nothing
+    }
+
     /**
      * Draw a radio button with label.
      */
@@ -179,8 +201,8 @@ public class TRadioButton extends TWidget {
         }
         putCharXY(2, 0, ')', radioButtonColor);
         putStringXY(4, 0, mnemonic.getRawLabel(), radioButtonColor);
-        if (mnemonic.getShortcutIdx() >= 0) {
-            putCharXY(4 + mnemonic.getShortcutIdx(), 0,
+        if (mnemonic.getScreenShortcutIdx() >= 0) {
+            putCharXY(4 + mnemonic.getScreenShortcutIdx(), 0,
                 mnemonic.getShortcut(), mnemonicColor);
         }
     }
@@ -200,14 +222,17 @@ public class TRadioButton extends TWidget {
     }
 
     /**
-     * Set RadioButton state, true means selected.  Note package private
-     * access.
+     * Set RadioButton state, true means selected.
      *
      * @param selected if true then this is the one button in the group that
      * is selected
      */
-    void setSelected(final boolean selected) {
-        this.selected = selected;
+    public void setSelected(final boolean selected) {
+        if (selected == true) {
+            ((TRadioGroup) getParent()).setSelected(id);
+        } else {
+            ((TRadioGroup) getParent()).setSelected(0);
+        }
     }
 
     /**