*
* 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"),
* two '&&' characters, e.g. "&File && Stuff" would be
* "File & Stuff" with the first 'F' highlighted.
*/
-public final class MnemonicString {
+public class MnemonicString {
// ------------------------------------------------------------------------
// Variables --------------------------------------------------------------
/**
* Keyboard shortcut to activate this item.
*/
- private char shortcut;
+ private int shortcut;
/**
* Location of the highlighted character.
*/
private int shortcutIdx = -1;
+ /**
+ * Screen location of the highlighted character (number of text cells
+ * required to display from the beginning to shortcutIdx).
+ */
+ private int screenShortcutIdx = -1;
+
/**
* The raw (uncolored) string.
*/
public MnemonicString(final String label) {
// Setup the menu shortcut
- String newLabel = "";
+ StringBuilder newLabel = new StringBuilder();
boolean foundAmp = false;
boolean foundShortcut = false;
int scanShortcutIdx = 0;
- for (int i = 0; i < label.length(); i++) {
- char c = label.charAt(i);
+ int scanScreenShortcutIdx = 0;
+ for (int i = 0; i < label.length();) {
+ int c = label.codePointAt(i);
+ i += Character.charCount(c);
+
if (c == '&') {
if (foundAmp) {
- newLabel += '&';
+ newLabel.append('&');
scanShortcutIdx++;
+ scanScreenShortcutIdx++;
} else {
foundAmp = true;
}
} else {
- newLabel += c;
+ newLabel.append(Character.toChars(c));
if (foundAmp) {
if (!foundShortcut) {
shortcut = c;
foundAmp = false;
foundShortcut = true;
shortcutIdx = scanShortcutIdx;
+ screenShortcutIdx = scanScreenShortcutIdx;
}
} else {
scanShortcutIdx++;
+ scanScreenShortcutIdx += StringUtils.width(c);
}
}
}
- this.rawLabel = newLabel;
+ this.rawLabel = newLabel.toString();
}
// ------------------------------------------------------------------------
*
* @return the highlighted character
*/
- public char getShortcut() {
+ public int getShortcut() {
return shortcut;
}
return shortcutIdx;
}
+ /**
+ * Get the screen location of the highlighted character.
+ *
+ * @return the number of text cells required to display from the
+ * beginning of the label to shortcutIdx
+ */
+ public int getScreenShortcutIdx() {
+ return screenShortcutIdx;
+ }
+
/**
* Get the raw (uncolored) string.
*