*/
@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
}
// 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;
}
* @param key global keyboard accelerator
* @return the new menu item
*/
- public TMenuItem addItem(final int id, final String label,
+ public final TMenuItem addItem(final int id, final String label,
final TKeypress key) {
assert (id >= 1024);
for (TWidget widget: getChildren()) {
widget.setWidth(getWidth() - 2);
}
- getApplication().addAccelerator(menuItem, toLower(key));
+ getApplication().addAccelerator(menuItem, key.toLowerCase());
getApplication().recomputeMenuX();
activate(0);
return menuItem;
* @param label menu item label
* @return the new menu item
*/
- public TMenuItem addItem(final int id, final String label) {
+ public final TMenuItem addItem(final int id, final String label) {
assert (id >= 1024);
return addItemInternal(id, label);
}
* (inclusive).
* @return the new menu item
*/
- public TMenuItem addDefaultItem(final int id) {
+ public final TMenuItem addDefaultItem(final int id) {
assert (id >= 0);
assert (id < 1024);
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:
/**
* Convenience function to add a menu separator.
*/
- public void addSeparator() {
+ public final void addSeparator() {
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);
}
* denoted by prefixing a letter with "&", e.g. "&File"
* @return the new sub-menu
*/
- public TSubMenu addSubMenu(final String title) {
+ public final TSubMenu addSubMenu(final String title) {
int newY = getChildren().size() + 1;
assert (newY < getHeight());