X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTLabel.java;h=0c62250ec79b3cd3cfa6af0307c34f7caeac8b86;hb=d8dc8aea32a07a0653933700f1abadc7776b013f;hp=75623ffc11ad8ecee95e062d4d0b506a4f63afca;hpb=1dac6b8d395e2bf3c1b58915f8f4f481d9e46793;p=fanfix.git

diff --git a/src/jexer/TLabel.java b/src/jexer/TLabel.java
index 75623ff..0c62250 100644
--- a/src/jexer/TLabel.java
+++ b/src/jexer/TLabel.java
@@ -30,6 +30,7 @@ package jexer;
 
 import jexer.bits.CellAttributes;
 import jexer.bits.MnemonicString;
+import jexer.bits.StringUtils;
 
 /**
  * TLabel implements a simple label, with an optional mnemonic hotkey action
@@ -157,7 +158,7 @@ public class TLabel extends TWidget {
         final TAction action) {
 
         // Set parent and window
-        super(parent, false, x, y, text.length(), 1);
+        super(parent, false, x, y, StringUtils.width(text), 1);
 
         mnemonic = new MnemonicString(text);
         this.colorKey = colorKey;
@@ -169,6 +170,17 @@ public class TLabel extends TWidget {
     // TWidget ----------------------------------------------------------------
     // ------------------------------------------------------------------------
 
+    /**
+     * 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 static label.
      */
@@ -185,8 +197,8 @@ public class TLabel extends TWidget {
             mnemonicColor.setBackColor(background.getBackColor());
         }
         putStringXY(0, 0, mnemonic.getRawLabel(), color);
-        if (mnemonic.getShortcutIdx() >= 0) {
-            putCharXY(mnemonic.getShortcutIdx(), 0,
+        if (mnemonic.getScreenShortcutIdx() >= 0) {
+            putCharXY(mnemonic.getScreenShortcutIdx(), 0,
                 mnemonic.getShortcut(), mnemonicColor);
         }
     }
@@ -225,7 +237,7 @@ public class TLabel extends TWidget {
     /**
      * Get the label color.
      *
-     * @param return the ColorTheme key color to use for foreground text
+     * @return the ColorTheme key color to use for foreground text
      */
     public String getColorKey() {
         return colorKey;