X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTRadioGroup.java;h=7460de413b653a2d3c2898a6d8a73a8a2ad172fd;hb=bfa37f3b2ef87d39c15fad7d565c00cbabd92acf;hp=6e6f39d22ad0f955f4b78bd3c9ffa140077828e3;hpb=615a0d99fd0aa4437116dd083147f9150d5e6527;p=fanfix.git

diff --git a/src/jexer/TRadioGroup.java b/src/jexer/TRadioGroup.java
index 6e6f39d..7460de4 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,6 +29,7 @@
 package jexer;
 
 import jexer.bits.CellAttributes;
+import jexer.bits.StringUtils;
 
 /**
  * TRadioGroup is a collection of TRadioButtons with a box and label.
@@ -49,6 +50,12 @@ public class TRadioGroup extends TWidget {
      */
     private TRadioButton selectedButton = null;
 
+    /**
+     * If true, one of the children MUST be selected.  Note package private
+     * access.
+     */
+    boolean requiresSelection = true;
+
     // ------------------------------------------------------------------------
     // Constructors -----------------------------------------------------------
     // ------------------------------------------------------------------------
@@ -65,7 +72,7 @@ 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;
     }
@@ -87,11 +94,11 @@ 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);
 
-        getScreen().hLineXY(1, 0, label.length() + 2, ' ', radioGroupColor);
-        getScreen().putStringXY(2, 0, label, radioGroupColor);
+        hLineXY(1, 0, StringUtils.width(label) + 2, ' ', radioGroupColor);
+        putStringXY(2, 0, label, radioGroupColor);
     }
 
     // ------------------------------------------------------------------------
@@ -117,12 +124,35 @@ public class TRadioGroup extends TWidget {
      */
     void setSelected(final TRadioButton button) {
         assert (button.isSelected());
-        if (selectedButton != null) {
+        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;
+        }
+
+        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;
+    }
+
     /**
      * Convenience function to add a radio button to this group.
      *
@@ -132,12 +162,17 @@ 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()) {
+            setWidth(StringUtils.width(label) + 7);
         }
         setHeight(getChildren().size() + 3);
-        return new TRadioButton(this, buttonX, buttonY, label,
+        TRadioButton button = new TRadioButton(this, buttonX, buttonY, label,
             getChildren().size() + 1);
+
+        // Default to the first item on the list.
+        activate(getChildren().get(0));
+
+        return button;
     }
 
 }