Update of /cvsroot/actionstep/actionstep/src/org/actionstep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10372
Modified Files:
NSButton.as NSCell.as NSObject.as
Log Message:
got simulated click working and tabbing to from buttons
Index: NSObject.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSObject.as,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NSObject.as 18 Jul 2005 03:51:01 -0000 1.14
--- NSObject.as 19 Jul 2005 22:40:18 -0000 1.15
***************
*** 40,43 ****
--- 40,46 ----
public static var NSNotFound:Number = -1;
public static var NSTabCharacter:Number = 9;
+ public static var NSNewlineCharacter:Number = 13;
+ public static var NSEnterCharacter:Number = 13;
+ public static var NSCarriageReturnCharacter:Number = 13;
public function init() {
Index: NSButton.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSButton.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NSButton.as 1 Jun 2005 03:32:41 -0000 1.6
--- NSButton.as 19 Jul 2005 22:40:18 -0000 1.7
***************
*** 269,275 ****
public function keyDown(event:NSEvent) {
! var chars:String = event.characters;
! //! handle newline, space, carriage return, enter
! //! and performClick(this);
}
--- 269,281 ----
public function keyDown(event:NSEvent) {
! var character:Number = event.keyCode;
! if ( (character == NSNewlineCharacter)
! || (character == NSEnterCharacter)
! || (character == NSCarriageReturnCharacter)
! || (character == 32)) {
! performClick(this);
! } else {
! super.keyDown(event);
! }
}
Index: NSCell.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSCell.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NSCell.as 24 Jun 2005 02:14:00 -0000 1.19
--- NSCell.as 19 Jul 2005 22:40:18 -0000 1.20
***************
*** 41,44 ****
--- 41,45 ----
import org.actionstep.NSSize;
import org.actionstep.NSText;
+ import org.actionstep.NSTimer;
import org.actionstep.NSNumber;
import org.actionstep.NSControl;
***************
*** 602,613 ****
}
if(view != null) {
! setNextState();
! //! can we simulate a highlight of the control ?
! NSControl(view).sendActionTo(action(), target());
} else {
setNextState();
NSApplication.sharedApplication().sendActionToFrom(action(), target(), this);
}
!
}
--- 603,621 ----
}
if(view != null) {
! setHighlighted(true);
! drawWithFrameInView(frame, view);
! NSTimer.scheduledTimerWithTimeIntervalTargetSelectorUserInfoRepeats(.1, this, "__performClickCallback", {frame:frame, view:view}, false);
} else {
setNextState();
NSApplication.sharedApplication().sendActionToFrom(action(), target(), this);
}
! }
!
! private function __performClickCallback(timer:NSTimer) {
! var info = timer.userInfo();
! setHighlighted(false);
! drawWithFrameInView(info.frame, info.view);
! setNextState();
! NSControl(info.view).sendActionTo(action(), target());
}
|
