Trying to merge

This commit is contained in:
jtrobinson 2012-12-04 16:34:25 +00:00
parent 41b59d6e92
commit d86dbcb423
2 changed files with 6 additions and 3 deletions

View File

@ -352,11 +352,9 @@
}
public function handleKeyDown(e:KeyboardEvent) :void {
//LogUtil.debug("WATERFALL: Entering handleKeyDown");
var keyPress:String = (e.ctrlKey ? "control+" : "") + (e.shiftKey ? "shift+" : "") + (e.altKey ? "alt+" : "") + e.keyCode;
//LogUtil.debug("WATERFALL keypress: " + keyPress);
if (keyCombos == null) loadKeyCombos();
if (keyCombos[keyPress]) {
//LogUtil.debug("WATERFALL keypress matched something in keyCombos: " + keyCombos[keyPress]);
var event:ShortcutEvent = new ShortcutEvent(keyCombos[keyPress]);
event.otherUserID = chatWithUserID;
globalDispatcher.dispatchEvent(event);

View File

@ -123,6 +123,11 @@
autoPublishTimer.start();
}
titleBarOverlay.enabled = true;
maximizeRestoreBtn.enabled = true;
//shortcut
titleBarOverlay.tabIndex = baseIndex;
minimizeBtn.tabIndex = baseIndex+1;
maximizeRestoreBtn.tabIndex = baseIndex+2;