Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc'

[nikiroo-utils.git] / src / jexer / menu / TMenuItem.java

diff --git a/src/jexer/menu/TMenuItem.java b/src/jexer/menu/TMenuItem.java
index bd149abb08b4ae8e6c65943b249832e954c4e78d..b478059c077d17916dffff4b6b864f22874cbaf6 100644 (file)
--- a/src/jexer/menu/TMenuItem.java
+++ b/src/jexer/menu/TMenuItem.java
@@ -33,6 +33,7 @@ import jexer.TWidget;
 import jexer.bits.CellAttributes;
 import jexer.bits.GraphicsChars;
 import jexer.bits.MnemonicString;
+import jexer.bits.StringUtils;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
 import jexer.event.TMenuEvent;
@@ -79,6 +80,11 @@ public class TMenuItem extends TWidget {
      */
     private MnemonicString mnemonic;
 
+    /**
+     * An optional 2-cell-wide picture/icon for this item.
+     */
+    private int icon = -1;
+
     // ------------------------------------------------------------------------
     // Constructors -----------------------------------------------------------
     // ------------------------------------------------------------------------
@@ -95,6 +101,22 @@ public class TMenuItem extends TWidget {
     TMenuItem(final TMenu parent, final int id, final int x, final int y,
         final String label) {
 
+        this(parent, id, x, y, label, -1);
+    }
+
+    /**
+     * Package private constructor.
+     *
+     * @param parent parent widget
+     * @param id menu id
+     * @param x column relative to parent
+     * @param y row relative to parent
+     * @param label menu item title
+     * @param icon icon picture/emoji
+     */
+    TMenuItem(final TMenu parent, final int id, final int x, final int y,
+        final String label, final int icon) {
+
         // Set parent and window
         super(parent);
 
@@ -104,8 +126,13 @@ public class TMenuItem extends TWidget {
         setY(y);
         setHeight(1);
         this.label = mnemonic.getRawLabel();
-        setWidth(label.length() + 4);
+        if (parent.useIcons) {
+            setWidth(StringUtils.width(label) + 6);
+        } else {
+            setWidth(StringUtils.width(label) + 4);
+        }
         this.id = id;
+        this.icon = icon;
 
         // Default state for some known menu items
         switch (id) {
@@ -219,26 +246,31 @@ public class TMenuItem extends TWidget {
             }
         }
 
+        boolean useIcons = ((TMenu) getParent()).useIcons;
+
         char cVSide = GraphicsChars.WINDOW_SIDE;
         vLineXY(0, 0, 1, cVSide, background);
         vLineXY(getWidth() - 1, 0, 1, cVSide, background);
 
         hLineXY(1, 0, getWidth() - 2, ' ', menuColor);
-        putStringXY(2, 0, mnemonic.getRawLabel(), menuColor);
+        putStringXY(2 + (useIcons ? 2 : 0), 0, mnemonic.getRawLabel(),
+            menuColor);
         if (key != null) {
             String keyLabel = key.toString();
-            putStringXY((getWidth() - keyLabel.length() - 2), 0, keyLabel,
-                menuColor);
+            putStringXY((getWidth() - StringUtils.width(keyLabel) - 2), 0,
+                keyLabel, menuColor);
         }
-        if (mnemonic.getShortcutIdx() >= 0) {
-            putCharXY(2 + mnemonic.getShortcutIdx(), 0, mnemonic.getShortcut(),
-                menuMnemonicColor);
+        if (mnemonic.getScreenShortcutIdx() >= 0) {
+            putCharXY(2 + (useIcons ? 2 : 0) + mnemonic.getScreenShortcutIdx(),
+                0, mnemonic.getShortcut(), menuMnemonicColor);
         }
         if (checked) {
             assert (checkable);
             putCharXY(1, 0, GraphicsChars.CHECK, menuColor);
         }
-
+        if ((useIcons == true) && (icon != -1)) {
+            putCharXY(2, 0, icon, menuColor);
+        }
     }
 
     // ------------------------------------------------------------------------
@@ -315,13 +347,36 @@ public class TMenuItem extends TWidget {
         this.key = key;
 
         if (key != null) {
-            int newWidth = (label.length() + 4 + key.toString().length() + 2);
+            int newWidth = (StringUtils.width(label) + 4 +
+                StringUtils.width(key.toString()) + 2);
+            if (((TMenu) getParent()).useIcons) {
+                newWidth += 2;
+            }
             if (newWidth > getWidth()) {
                 setWidth(newWidth);
             }
         }
     }
 
+    /**
+     * Get a picture/emoji icon for this menu item.
+     *
+     * @return the codepoint, or -1 if no icon is specified for this menu
+     * item
+     */
+    public final int getIcon() {
+        return icon;
+    }
+
+    /**
+     * Set a picture/emoji icon for this menu item.
+     *
+     * @param icon a codepoint, or -1 to unset the icon
+     */
+    public final void setIcon(final int icon) {
+        this.icon = icon;
+    }
+
     /**
      * Dispatch event(s) due to selection or click.
      */