-/**
+/*
* Jexer - Java Text User Interface
*
* License: LGPLv3 or later
*/
@Override
public void draw() {
- CellAttributes menuColor;
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++) {
@Override
public void onMouseDown(final TMouseEvent mouse) {
this.mouse = mouse;
- setRepaint();
// Pass to children
for (TWidget widget: getChildren()) {
@Override
public void onMouseUp(final TMouseEvent mouse) {
this.mouse = mouse;
- setRepaint();
// Pass to children
for (TWidget widget: getChildren()) {
@Override
public void onMouseMotion(final TMouseEvent mouse) {
this.mouse = mouse;
- setRepaint();
// See if we should activate a different menu item
for (TWidget widget: getChildren()) {
- if ((mouse.getMouse1())
+ if ((mouse.isMouse1())
&& (widget.mouseWouldHit(mouse))
) {
// Activate this menu item
*/
@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;
}
return;
}
if (keypress.equals(kbRight)) {
- if (!isSubMenu) {
- getApplication().switchMenu(true);
- }
+ getApplication().switchMenu(true);
return;
}
if (keypress.equals(kbLeft)) {
}
// Switch to a menuItem if it has an mnemonic
- if (!keypress.getKey().getIsKey()
- && !keypress.getKey().getAlt()
- && !keypress.getKey().getCtrl()) {
+ if (!keypress.getKey().isFnKey()
+ && !keypress.getKey().isAlt()
+ && !keypress.getKey().isCtrl()) {
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().getChar()))
) {
// Send an enter keystroke to it
activate(item);
// Dispatch the keypress to an active widget
for (TWidget widget: getChildren()) {
- if (widget.getActive()) {
- setRepaint();
+ if (widget.isActive()) {
widget.handleEvent(keypress);
return;
}
for (TWidget widget: getChildren()) {
widget.setWidth(getWidth() - 2);
}
- getApplication().addAccelerator(menuItem, toLower(key));
+ getApplication().addAccelerator(menuItem, key.toLowerCase());
getApplication().recomputeMenuX();
activate(0);
return menuItem;
break;
case MID_CLEAR:
label = "C&lear";
- key = kbDel;
+ hasKey = false;
+ // key = kbDel;
break;
case MID_TILE:
break;
case MID_WINDOW_CLOSE:
label = "&Close";
- key = kbCtrlW;
+ hasKey = false;
+ // key = kbCtrlW;
break;
default:
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);
}