X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fmenu%2FTMenuItem.java;h=e60d1d4e7e320b00a2b2997bf5140cf80811fb19;hb=0d47c5460c8e9d1198928308767a63ad35f46eb8;hp=607341b2734eaa4e35d5e941d3d34c3c94917802;hpb=8e688b9211599d240be67e5cf62dfe48520378f2;p=fanfix.git diff --git a/src/jexer/menu/TMenuItem.java b/src/jexer/menu/TMenuItem.java index 607341b..e60d1d4 100644 --- a/src/jexer/menu/TMenuItem.java +++ b/src/jexer/menu/TMenuItem.java @@ -200,11 +200,11 @@ public class TMenuItem extends TWidget { CellAttributes background = getTheme().getColor("tmenu"); CellAttributes menuColor; CellAttributes menuMnemonicColor; - if (getAbsoluteActive()) { + if (isAbsoluteActive()) { menuColor = getTheme().getColor("tmenu.highlighted"); menuMnemonicColor = getTheme().getColor("tmenu.mnemonic.highlighted"); } else { - if (getEnabled()) { + if (isEnabled()) { menuColor = getTheme().getColor("tmenu"); menuMnemonicColor = getTheme().getColor("tmenu.mnemonic"); } else { @@ -218,10 +218,10 @@ public class TMenuItem extends TWidget { getScreen().vLineXY(getWidth() - 1, 0, 1, cVSide, background); getScreen().hLineXY(1, 0, getWidth() - 2, ' ', menuColor); - getScreen().putStrXY(2, 0, mnemonic.getRawLabel(), menuColor); + getScreen().putStringXY(2, 0, mnemonic.getRawLabel(), menuColor); if (hasKey) { String keyLabel = key.toString(); - getScreen().putStrXY((getWidth() - keyLabel.length() - 2), 0, + getScreen().putStringXY((getWidth() - keyLabel.length() - 2), 0, keyLabel, menuColor); } if (mnemonic.getShortcutIdx() >= 0) { @@ -239,7 +239,7 @@ public class TMenuItem extends TWidget { * Dispatch event(s) due to selection or click. */ public void dispatch() { - assert (getEnabled()); + assert (isEnabled()); getApplication().addMenuEvent(new TMenuEvent(id)); if (checkable) { @@ -269,7 +269,7 @@ public class TMenuItem extends TWidget { */ @Override public void onMouseUp(final TMouseEvent mouse) { - if ((mouseOnMenuItem(mouse)) && (mouse.getMouse1())) { + if ((mouseOnMenuItem(mouse)) && (mouse.isMouse1())) { dispatch(); return; }