git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#35 fixup
[fanfix.git]
/
src
/
jexer
/
TLabel.java
diff --git
a/src/jexer/TLabel.java
b/src/jexer/TLabel.java
index c34aee16f32aa699009835b119e95442b8915c7c..38c014c26ea256441d37bb2a03c88417c49fd8c1 100644
(file)
--- 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.CellAttributes;
import jexer.bits.MnemonicString;
+import jexer.bits.StringUtils;
/**
* TLabel implements a simple label, with an optional mnemonic hotkey action
/**
* 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
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;
mnemonic = new MnemonicString(text);
this.colorKey = colorKey;
@@
-185,8
+186,8
@@
public class TLabel extends TWidget {
mnemonicColor.setBackColor(background.getBackColor());
}
putStringXY(0, 0, mnemonic.getRawLabel(), color);
mnemonicColor.setBackColor(background.getBackColor());
}
putStringXY(0, 0, mnemonic.getRawLabel(), color);
- if (mnemonic.getShortcutIdx() >= 0) {
- putCharXY(mnemonic.getShortcutIdx(), 0,
+ if (mnemonic.getS
creenS
hortcutIdx() >= 0) {
+ putCharXY(mnemonic.getS
creenS
hortcutIdx(), 0,
mnemonic.getShortcut(), mnemonicColor);
}
}
mnemonic.getShortcut(), mnemonicColor);
}
}