X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fmenu%2FTMenuItem.java;h=d9dfc2ac5482b64123713f45e8b58f7f9abf3e3d;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=63a5355e348f0e553215a67c88d45c9979a856d5;hpb=d6ee0801333ff93dffd851f4c1a44519c96c371d;p=fanfix.git

diff --git a/src/jexer/menu/TMenuItem.java b/src/jexer/menu/TMenuItem.java
index 63a5355..d9dfc2a 100644
--- a/src/jexer/menu/TMenuItem.java
+++ b/src/jexer/menu/TMenuItem.java
@@ -3,7 +3,7 @@
  *
  * 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"),
@@ -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;
@@ -104,7 +105,7 @@ public class TMenuItem extends TWidget {
         setY(y);
         setHeight(1);
         this.label = mnemonic.getRawLabel();
-        setWidth(label.length() + 4);
+        setWidth(StringUtils.width(label) + 4);
         this.id = id;
 
         // Default state for some known menu items
@@ -220,23 +221,23 @@ public class TMenuItem extends TWidget {
         }
 
         char cVSide = GraphicsChars.WINDOW_SIDE;
-        getScreen().vLineXY(0, 0, 1, cVSide, background);
-        getScreen().vLineXY(getWidth() - 1, 0, 1, cVSide, background);
+        vLineXY(0, 0, 1, cVSide, background);
+        vLineXY(getWidth() - 1, 0, 1, cVSide, background);
 
-        getScreen().hLineXY(1, 0, getWidth() - 2, ' ', menuColor);
-        getScreen().putStringXY(2, 0, mnemonic.getRawLabel(), menuColor);
+        hLineXY(1, 0, getWidth() - 2, ' ', menuColor);
+        putStringXY(2, 0, mnemonic.getRawLabel(), menuColor);
         if (key != null) {
             String keyLabel = key.toString();
-            getScreen().putStringXY((getWidth() - keyLabel.length() - 2), 0,
+            putStringXY((getWidth() - StringUtils.width(keyLabel) - 2), 0,
                 keyLabel, menuColor);
         }
-        if (mnemonic.getShortcutIdx() >= 0) {
-            getScreen().putCharXY(2 + mnemonic.getShortcutIdx(), 0,
+        if (mnemonic.getScreenShortcutIdx() >= 0) {
+            putCharXY(2 + mnemonic.getScreenShortcutIdx(), 0,
                 mnemonic.getShortcut(), menuMnemonicColor);
         }
         if (checked) {
             assert (checkable);
-            getScreen().putCharXY(1, 0, GraphicsChars.CHECK, menuColor);
+            putCharXY(1, 0, GraphicsChars.CHECK, menuColor);
         }
 
     }
@@ -263,6 +264,30 @@ public class TMenuItem extends TWidget {
         this.checkable = checkable;
     }
 
+    /**
+     * Get checkable flag.
+     *
+     * @return true if this menu item is both checkable and checked
+     */
+    public final boolean getChecked() {
+        return ((checkable == true) && (checked == true));
+    }
+
+    /**
+     * Set checked flag.  Note that setting checked on an item checkable will
+     * do nothing.
+     *
+     * @param checked if true, and if this menu item is checkable, then
+     * getChecked() will return true
+     */
+    public final void setChecked(final boolean checked) {
+        if (checkable) {
+            this.checked = checked;
+        } else {
+            this.checked = false;
+        }
+    }
+
     /**
      * Get the mnemonic string for this menu item.
      *
@@ -291,7 +316,8 @@ 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 (newWidth > getWidth()) {
                 setWidth(newWidth);
             }