X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTRadioGroup.java;h=a82b074f8ce9a1c4fe6de462433b8d4124507b91;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=d811f273a56c6a6fc6d62b9a516701d2c894f55a;hpb=051e29138b18fb4b731a72f8727475b10e4c74e4;p=nikiroo-utils.git

diff --git a/src/jexer/TRadioGroup.java b/src/jexer/TRadioGroup.java
index d811f27..a82b074 100644
--- a/src/jexer/TRadioGroup.java
+++ b/src/jexer/TRadioGroup.java
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2017 Kevin Lamonte
+ * Copyright (C) 2019 Kevin Lamonte
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,12 +29,17 @@
 package jexer;
 
 import jexer.bits.CellAttributes;
+import jexer.bits.StringUtils;
 
 /**
  * TRadioGroup is a collection of TRadioButtons with a box and label.
  */
 public class TRadioGroup extends TWidget {
 
+    // ------------------------------------------------------------------------
+    // Variables --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Label for this radio button group.
      */
@@ -46,29 +51,14 @@ public class TRadioGroup extends TWidget {
     private TRadioButton selectedButton = null;
 
     /**
-     * Get the radio button ID that was selected.
-     *
-     * @return ID of the selected button, or 0 if no button is selected
+     * If true, one of the children MUST be selected.  Note package private
+     * access.
      */
-    public int getSelected() {
-        if (selectedButton == null) {
-            return 0;
-        }
-        return selectedButton.getId();
-    }
+    boolean requiresSelection = true;
 
-    /**
-     * Set the new selected radio button.  Note package private access.
-     *
-     * @param button new button that became selected
-     */
-    void setSelected(final TRadioButton button) {
-        assert (button.isSelected());
-        if (selectedButton != null) {
-            selectedButton.setSelected(false);
-        }
-        selectedButton = button;
-    }
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
 
     /**
      * Public constructor.
@@ -82,11 +72,36 @@ public class TRadioGroup extends TWidget {
         final String label) {
 
         // Set parent and window
-        super(parent, x, y, label.length() + 4, 2);
+        super(parent, x, y, StringUtils.width(label) + 4, 2);
 
         this.label = label;
     }
 
+    // ------------------------------------------------------------------------
+    // 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.
      */
@@ -100,11 +115,63 @@ public class TRadioGroup extends TWidget {
             radioGroupColor = getTheme().getColor("tradiogroup.inactive");
         }
 
-        getScreen().drawBox(0, 0, getWidth(), getHeight(),
-            radioGroupColor, radioGroupColor, 3, false);
+        drawBox(0, 0, getWidth(), getHeight(), radioGroupColor, radioGroupColor,
+            3, false);
+
+        hLineXY(1, 0, StringUtils.width(label) + 2, ' ', radioGroupColor);
+        putStringXY(2, 0, label, radioGroupColor);
+    }
+
+    // ------------------------------------------------------------------------
+    // TRadioGroup ------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
+    /**
+     * Get the radio button ID that was selected.
+     *
+     * @return ID of the selected button, or 0 if no button is selected
+     */
+    public int getSelected() {
+        if (selectedButton == null) {
+            return 0;
+        }
+        return selectedButton.getId();
+    }
+
+    /**
+     * Set the new selected radio button.  Note package private access.
+     *
+     * @param button new button that became selected
+     */
+    void setSelected(final TRadioButton button) {
+        assert (button.isSelected());
+        if ((selectedButton != null) && (selectedButton != button)) {
+            selectedButton.setSelected(false);
+        }
+        selectedButton = button;
+    }
+
+    /**
+     * Set the new selected radio button.  1-based.
+     *
+     * @param id ID of the selected button, or 0 to unselect
+     */
+    public void setSelected(final int id) {
+        if ((id < 0) || (id > getChildren().size())) {
+            return;
+        }
 
-        getScreen().hLineXY(1, 0, label.length() + 2, ' ', radioGroupColor);
-        getScreen().putStringXY(2, 0, label, radioGroupColor);
+        if (id == 0) {
+            for (TWidget widget: getChildren()) {
+                ((TRadioButton) widget).setSelected(false);
+            }
+            selectedButton = null;
+            return;
+        }
+        assert ((id > 0) && (id <= getChildren().size()));
+        TRadioButton button = (TRadioButton) (getChildren().get(id - 1));
+        button.setSelected(true);
+        selectedButton = button;
     }
 
     /**
@@ -116,12 +183,21 @@ public class TRadioGroup extends TWidget {
     public TRadioButton addRadioButton(final String label) {
         int buttonX = 1;
         int buttonY = getChildren().size() + 1;
-        if (label.length() + 4 > getWidth()) {
-            setWidth(label.length() + 7);
+        if (StringUtils.width(label) + 4 > getWidth()) {
+            super.setWidth(StringUtils.width(label) + 7);
         }
-        setHeight(getChildren().size() + 3);
-        return new TRadioButton(this, buttonX, buttonY, label,
+        super.setHeight(getChildren().size() + 3);
+        TRadioButton button = new TRadioButton(this, buttonX, buttonY, label,
             getChildren().size() + 1);
+
+        if (getParent().getLayoutManager() != null) {
+            getParent().getLayoutManager().resetSize(this);
+        }
+
+        // Default to the first item on the list.
+        activate(getChildren().get(0));
+
+        return button;
     }
 
 }