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
bugfixes
[fanfix.git]
/
src
/
jexer
/
menu
/
TMenu.java
diff --git
a/src/jexer/menu/TMenu.java
b/src/jexer/menu/TMenu.java
index c9938084b3d47e9a1808041cefdc19a09eb1fc60..ecdb7f7cd03f1bb9e54b3d23f216cdaa71b3e93f 100644
(file)
--- a/
src/jexer/menu/TMenu.java
+++ b/
src/jexer/menu/TMenu.java
@@
-126,16
+126,9
@@
public final class TMenu extends TWindow {
*/
@Override
public void draw() {
*/
@Override
public void draw() {
- CellAttributes menuColor;
CellAttributes background = getTheme().getColor("tmenu");
CellAttributes background = getTheme().getColor("tmenu");
- if (getAbsoluteActive()) {
- menuColor = getTheme().getColor("tmenu.highlighted");
- } else {
- menuColor = getTheme().getColor("tmenu");
- }
-
- assert (getAbsoluteActive());
+ assert (isAbsoluteActive());
// Fill in the interior background
for (int i = 0; i < getHeight(); i++) {
// Fill in the interior background
for (int i = 0; i < getHeight(); i++) {
@@
-177,7
+170,6
@@
public final class TMenu extends TWindow {
@Override
public void onMouseDown(final TMouseEvent mouse) {
this.mouse = mouse;
@Override
public void onMouseDown(final TMouseEvent mouse) {
this.mouse = mouse;
- setRepaint();
// Pass to children
for (TWidget widget: getChildren()) {
// Pass to children
for (TWidget widget: getChildren()) {
@@
-202,7
+194,6
@@
public final class TMenu extends TWindow {
@Override
public void onMouseUp(final TMouseEvent mouse) {
this.mouse = mouse;
@Override
public void onMouseUp(final TMouseEvent mouse) {
this.mouse = mouse;
- setRepaint();
// Pass to children
for (TWidget widget: getChildren()) {
// Pass to children
for (TWidget widget: getChildren()) {
@@
-227,11
+218,10
@@
public final class TMenu extends TWindow {
@Override
public void onMouseMotion(final TMouseEvent mouse) {
this.mouse = mouse;
@Override
public void onMouseMotion(final TMouseEvent mouse) {
this.mouse = mouse;
- setRepaint();
// See if we should activate a different menu item
for (TWidget widget: getChildren()) {
// See if we should activate a different menu item
for (TWidget widget: getChildren()) {
- if ((mouse.
get
Mouse1())
+ if ((mouse.
is
Mouse1())
&& (widget.mouseWouldHit(mouse))
) {
// Activate this menu item
&& (widget.mouseWouldHit(mouse))
) {
// Activate this menu item
@@
-251,8
+241,16
@@
public final class TMenu extends TWindow {
*/
@Override
public void onKeypress(final TKeypressEvent keypress) {
*/
@Override
public void onKeypress(final TKeypressEvent keypress) {
- if (getActiveChild() != null) {
- if (getActiveChild() instanceof TSubMenu) {
+
+ /*
+ System.err.printf("keypress: %s active child: %s\n", keypress,
+ getActiveChild());
+ */
+
+ if (getActiveChild() != this) {
+ if ((getActiveChild() instanceof TSubMenu)
+ || (getActiveChild() instanceof TMenu)
+ ) {
getActiveChild().onKeypress(keypress);
return;
}
getActiveChild().onKeypress(keypress);
return;
}
@@
-271,9
+269,7
@@
public final class TMenu extends TWindow {
return;
}
if (keypress.equals(kbRight)) {
return;
}
if (keypress.equals(kbRight)) {
- if (!isSubMenu) {
- getApplication().switchMenu(true);
- }
+ getApplication().switchMenu(true);
return;
}
if (keypress.equals(kbLeft)) {
return;
}
if (keypress.equals(kbLeft)) {
@@
-286,14
+282,14
@@
public final class TMenu extends TWindow {
}
// Switch to a menuItem if it has an mnemonic
}
// Switch to a menuItem if it has an mnemonic
- if (!keypress.getKey().
getIs
Key()
- && !keypress.getKey().
get
Alt()
- && !keypress.getKey().
get
Ctrl()) {
+ if (!keypress.getKey().
isFn
Key()
+ && !keypress.getKey().
is
Alt()
+ && !keypress.getKey().
is
Ctrl()) {
for (TWidget widget: getChildren()) {
TMenuItem item = (TMenuItem) widget;
if ((item.getMnemonic() != null)
&& (Character.toLowerCase(item.getMnemonic().getShortcut())
for (TWidget widget: getChildren()) {
TMenuItem item = (TMenuItem) widget;
if ((item.getMnemonic() != null)
&& (Character.toLowerCase(item.getMnemonic().getShortcut())
- == Character.toLowerCase(keypress.getKey().getCh()))
+ == Character.toLowerCase(keypress.getKey().getCh
ar
()))
) {
// Send an enter keystroke to it
activate(item);
) {
// Send an enter keystroke to it
activate(item);
@@
-305,8
+301,7
@@
public final class TMenu extends TWindow {
// Dispatch the keypress to an active widget
for (TWidget widget: getChildren()) {
// Dispatch the keypress to an active widget
for (TWidget widget: getChildren()) {
- if (widget.getActive()) {
- setRepaint();
+ if (widget.isActive()) {
widget.handleEvent(keypress);
return;
}
widget.handleEvent(keypress);
return;
}
@@
-439,7
+434,8
@@
public final class TMenu extends TWindow {
break;
case MID_CLEAR:
label = "C&lear";
break;
case MID_CLEAR:
label = "C&lear";
- key = kbDel;
+ hasKey = false;
+ // key = kbDel;
break;
case MID_TILE:
break;
case MID_TILE:
@@
-472,7
+468,8
@@
public final class TMenu extends TWindow {
break;
case MID_WINDOW_CLOSE:
label = "&Close";
break;
case MID_WINDOW_CLOSE:
label = "&Close";
- key = kbCtrlW;
+ hasKey = false;
+ // key = kbCtrlW;
break;
default:
break;
default:
@@
-492,7
+489,9
@@
public final class TMenu extends TWindow {
int newY = getChildren().size() + 1;
assert (newY < getHeight());
int newY = getChildren().size() + 1;
assert (newY < getHeight());
- TMenuItem menuItem = new TMenuSeparator(this, 1, newY);
+ // We just have to construct it, don't need to hang onto what it
+ // makes.
+ new TMenuSeparator(this, 1, newY);
setHeight(getHeight() + 1);
}
setHeight(getHeight() + 1);
}