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
fix javadoc header
[fanfix.git]
/
src
/
jexer
/
menu
/
TMenuItem.java
diff --git
a/src/jexer/menu/TMenuItem.java
b/src/jexer/menu/TMenuItem.java
index 607341b2734eaa4e35d5e941d3d34c3c94917802..ce57cc24e2c1095acefecb966c8e8ec440ac278e 100644
(file)
--- a/
src/jexer/menu/TMenuItem.java
+++ b/
src/jexer/menu/TMenuItem.java
@@
-1,4
+1,4
@@
-/*
*
+/*
* Jexer - Java Text User Interface
*
* License: LGPLv3 or later
* Jexer - Java Text User Interface
*
* License: LGPLv3 or later
@@
-200,11
+200,11
@@
public class TMenuItem extends TWidget {
CellAttributes background = getTheme().getColor("tmenu");
CellAttributes menuColor;
CellAttributes menuMnemonicColor;
CellAttributes background = getTheme().getColor("tmenu");
CellAttributes menuColor;
CellAttributes menuMnemonicColor;
- if (
get
AbsoluteActive()) {
+ if (
is
AbsoluteActive()) {
menuColor = getTheme().getColor("tmenu.highlighted");
menuMnemonicColor = getTheme().getColor("tmenu.mnemonic.highlighted");
} else {
menuColor = getTheme().getColor("tmenu.highlighted");
menuMnemonicColor = getTheme().getColor("tmenu.mnemonic.highlighted");
} else {
- if (
get
Enabled()) {
+ if (
is
Enabled()) {
menuColor = getTheme().getColor("tmenu");
menuMnemonicColor = getTheme().getColor("tmenu.mnemonic");
} else {
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().vLineXY(getWidth() - 1, 0, 1, cVSide, background);
getScreen().hLineXY(1, 0, getWidth() - 2, ' ', menuColor);
- getScreen().putStrXY(2, 0, mnemonic.getRawLabel(), menuColor);
+ getScreen().putStr
ing
XY(2, 0, mnemonic.getRawLabel(), menuColor);
if (hasKey) {
String keyLabel = key.toString();
if (hasKey) {
String keyLabel = key.toString();
- getScreen().putStrXY((getWidth() - keyLabel.length() - 2), 0,
+ getScreen().putStr
ing
XY((getWidth() - keyLabel.length() - 2), 0,
keyLabel, menuColor);
}
if (mnemonic.getShortcutIdx() >= 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() {
* Dispatch event(s) due to selection or click.
*/
public void dispatch() {
- assert (
get
Enabled());
+ assert (
is
Enabled());
getApplication().addMenuEvent(new TMenuEvent(id));
if (checkable) {
getApplication().addMenuEvent(new TMenuEvent(id));
if (checkable) {
@@
-269,7
+269,7
@@
public class TMenuItem extends TWidget {
*/
@Override
public void onMouseUp(final TMouseEvent mouse) {
*/
@Override
public void onMouseUp(final TMouseEvent mouse) {
- if ((mouseOnMenuItem(mouse)) && (mouse.
get
Mouse1())) {
+ if ((mouseOnMenuItem(mouse)) && (mouse.
is
Mouse1())) {
dispatch();
return;
}
dispatch();
return;
}