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
/
TSubMenu.java
diff --git
a/src/jexer/menu/TSubMenu.java
b/src/jexer/menu/TSubMenu.java
index 4720a701e3c90e787614c8f263014b8ff8cbb3e3..167b6a5b11fc7d656c912b36bac62ff5d8412587 100644
(file)
--- a/
src/jexer/menu/TSubMenu.java
+++ b/
src/jexer/menu/TSubMenu.java
@@
-1,4
+1,4
@@
-/*
*
+/*
* Jexer - Java Text User Interface
*
* License: LGPLv3 or later
* Jexer - Java Text User Interface
*
* License: LGPLv3 or later
@@
-76,19
+76,14
@@
public final class TSubMenu extends TMenuItem {
public void draw() {
super.draw();
public void draw() {
super.draw();
- CellAttributes background = getTheme().getColor("tmenu");
CellAttributes menuColor;
CellAttributes menuColor;
- CellAttributes menuMnemonicColor;
- if (getAbsoluteActive()) {
+ if (isAbsoluteActive()) {
menuColor = getTheme().getColor("tmenu.highlighted");
menuColor = getTheme().getColor("tmenu.highlighted");
- menuMnemonicColor = getTheme().getColor("tmenu.mnemonic.highlighted");
} else {
} else {
- if (
get
Enabled()) {
+ if (
is
Enabled()) {
menuColor = getTheme().getColor("tmenu");
menuColor = getTheme().getColor("tmenu");
- menuMnemonicColor = getTheme().getColor("tmenu.mnemonic");
} else {
menuColor = getTheme().getColor("tmenu.disabled");
} else {
menuColor = getTheme().getColor("tmenu.disabled");
- menuMnemonicColor = getTheme().getColor("tmenu.disabled");
}
}
}
}
@@
-105,7
+100,7
@@
public final class TSubMenu extends TMenuItem {
@Override
public void onKeypress(final TKeypressEvent keypress) {
@Override
public void onKeypress(final TKeypressEvent keypress) {
- if (menu.
get
Active()) {
+ if (menu.
is
Active()) {
menu.onKeypress(keypress);
return;
}
menu.onKeypress(keypress);
return;
}
@@
-151,9
+146,9
@@
public final class TSubMenu extends TMenuItem {
*/
@Override
public void dispatch() {
*/
@Override
public void dispatch() {
- assert (
get
Enabled());
- if (
get
AbsoluteActive()) {
- if (!menu.
get
Active()) {
+ assert (
is
Enabled());
+ if (
is
AbsoluteActive()) {
+ if (!menu.
is
Active()) {
getApplication().addSubMenu(menu);
menu.setActive(true);
}
getApplication().addSubMenu(menu);
menu.setActive(true);
}
@@
-167,7
+162,7
@@
public final class TSubMenu extends TMenuItem {
*/
@Override
public TWidget getActiveChild() {
*/
@Override
public TWidget getActiveChild() {
- if (menu.
get
Active()) {
+ if (menu.
is
Active()) {
return menu;
}
// Menu not active, return me
return menu;
}
// Menu not active, return me