X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTRadioGroup.java;h=a82b074f8ce9a1c4fe6de462433b8d4124507b91;hb=d15905f9d78264562da8bbcc36622e4ea4ac4d82;hp=0f84e71904fc7fef1b00fbacbb21d5fc3843e98c;hpb=00691e80f2f135f92be739e2b7e86775a2357276;p=fanfix.git

diff --git a/src/jexer/TRadioGroup.java b/src/jexer/TRadioGroup.java
index 0f84e71..a82b074 100644
--- a/src/jexer/TRadioGroup.java
+++ b/src/jexer/TRadioGroup.java
@@ -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.
@@ -71,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;
     }
@@ -80,6 +81,27 @@ public class TRadioGroup 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.
      */
@@ -96,7 +118,7 @@ public class TRadioGroup extends TWidget {
         drawBox(0, 0, getWidth(), getHeight(), radioGroupColor, radioGroupColor,
             3, false);
 
-        hLineXY(1, 0, label.length() + 2, ' ', radioGroupColor);
+        hLineXY(1, 0, StringUtils.width(label) + 2, ' ', radioGroupColor);
         putStringXY(2, 0, label, radioGroupColor);
     }
 
@@ -161,13 +183,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()) {
+            super.setWidth(StringUtils.width(label) + 7);
         }
-        setHeight(getChildren().size() + 3);
+        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));