[Actionstep-commits] actionstep/src/org/actionstep NSApplication.as,1.18,1.19 NSWindow.as,1.16,1.17 ASRootWindowView.as,1.6,1.7

[Richard K. <ric...@us...>]

Update of /cvsroot/actionstep/actionstep/src/org/actionstep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12238

Modified Files:
	NSApplication.as NSWindow.as ASRootWindowView.as 
Log Message:
key windows now working (title's change based on key)

Index: ASRootWindowView.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/ASRootWindowView.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ASRootWindowView.as	6 Jul 2005 18:30:18 -0000	1.6
--- ASRootWindowView.as	6 Jul 2005 19:02:57 -0000	1.7
***************
*** 56,60 ****
--- 56,62 ----
    
    private var m_titleTextField:TextField;
+   private var m_titleTextFormat:TextFormat;
    private var m_titleFont:NSFont;
+   private var m_titleKeyFontColor:NSColor;
    private var m_titleFontColor:NSColor;
    
***************
*** 101,105 ****
      initWithFrame(frame);
      m_titleFont = NSFont.systemFontOfSize(12);
!     m_titleFontColor = NSColor.systemFontColor();
      m_window = window;
      setLowerView(highestViewOfLevel());
--- 103,111 ----
      initWithFrame(frame);
      m_titleFont = NSFont.systemFontOfSize(12);
!     m_titleKeyFontColor = NSColor.systemFontColor();
!     m_titleFontColor = new NSColor(0x666666);
!     m_titleTextFormat = m_titleFont.textFormat();
!     m_titleTextFormat.bold = true;
!     m_titleTextFormat.color = m_titleKeyFontColor.value;
      m_window = window;
      setLowerView(highestViewOfLevel());
***************
*** 292,296 ****
      }
      
!     var fillColors:Array = [0xFFFFFF, 0xDEDEDE, 0xC6C6C6];
      var fillAlpha:Number = 100;
      var cornerRadius:Number = 4;
--- 298,304 ----
      }
      
!     var isKey:Boolean = m_window.isKeyWindow();
!     
!     var fillColors:Array = isKey ? [0xFFFFFF, 0xDEDEDE, 0xC6C6C6] : [0xFFFFFF, 0xDEDEDE, 0xFFFFFF];
      var fillAlpha:Number = 100;
      var cornerRadius:Number = 4;
***************
*** 311,321 ****
      if (m_titleTextField.text != m_window.title()) {
        m_titleTextField.text = m_window.title();
-       var textFormat = m_titleFont.textFormat();
-       textFormat.bold = true;
-       textFormat.color = m_titleFontColor.value;
-       m_titleTextField.setTextFormat(textFormat);
        m_titleTextField._y = (22 - (m_titleTextField.textHeight+2))/2;;
        m_titleTextField._x = (width - (m_titleTextField.textWidth+4))/2;
      }
      
      var totalHeight = rect.size.height-1;
--- 319,327 ----
      if (m_titleTextField.text != m_window.title()) {
        m_titleTextField.text = m_window.title();
        m_titleTextField._y = (22 - (m_titleTextField.textHeight+2))/2;;
        m_titleTextField._x = (width - (m_titleTextField.textWidth+4))/2;
      }
+     m_titleTextFormat.color = isKey ? m_titleKeyFontColor.value : m_titleFontColor.value;
+     m_titleTextField.setTextFormat(m_titleTextFormat);
      
      var totalHeight = rect.size.height-1;

Index: NSApplication.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSApplication.as,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NSApplication.as	6 Jul 2005 17:27:51 -0000	1.18
--- NSApplication.as	6 Jul 2005 19:02:56 -0000	1.19
***************
*** 106,111 ****
    
    public function setKeyWindow(value:NSWindow) {
      m_keyWindow = value;
- 		value.makeKeyWindow();
    }
    
--- 106,111 ----
    
    public function setKeyWindow(value:NSWindow) {
+     value.makeKeyWindow();
      m_keyWindow = value;
    }
    
***************
*** 115,120 ****
    
    public function setMainWindow(value:NSWindow) {
      m_mainWindow = value;
- 		value.makeMainWindow();
    }
    
--- 115,120 ----
    
    public function setMainWindow(value:NSWindow) {
+     value.makeMainWindow();
      m_mainWindow = value;
    }
    
***************
*** 172,176 ****
      try {
        if (event.type == NSEvent.NSLeftMouseDown) {
!         m_currentEvent.window.makeKeyAndOrderFront();
        }
        m_currentEvent.window.sendEvent(m_currentEvent);
--- 172,177 ----
      try {
        if (event.type == NSEvent.NSLeftMouseDown) {
!         m_currentEvent.window.orderFront();
!         setKeyWindow(m_currentEvent.window);
        }
        m_currentEvent.window.sendEvent(m_currentEvent);

Index: NSWindow.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSWindow.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** NSWindow.as	6 Jul 2005 17:28:51 -0000	1.16
--- NSWindow.as	6 Jul 2005 19:02:57 -0000	1.17
***************
*** 99,104 ****
  	private var m_title:String;
  	
! 	private var m_keyWin:Number;
! 	private var	m_mainWin:Number;
    
    private var m_isKey:Boolean;
--- 99,104 ----
  	private var m_title:String;
  	
! 	//private var m_keyWin:Number;
! 	//private var	m_mainWin:Number;
    
    private var m_isKey:Boolean;
***************
*** 121,133 ****
      m_level = NSNormalWindowLevel;
  		m_windowNumber = g_instances.length;
!     var x = m_windowNumber;
! 		if(m_keyWin==null) {
! 			m_keyWin = x;
  			m_app.setKeyWindow(this);
! 		}
! 		if(m_mainWin==null) {
! 			m_mainWin = x;
  			m_app.setMainWindow(this);
! 		}
    }
    
--- 121,133 ----
      m_level = NSNormalWindowLevel;
  		m_windowNumber = g_instances.length;
!     //var x = m_windowNumber;
! 		//if(m_keyWin==null) {
! 			//m_keyWin = x;
  			m_app.setKeyWindow(this);
! 		//}
! 		//if(m_mainWin==null) {
! 			//m_mainWin = x;
  			m_app.setMainWindow(this);
! 		//}
    }
    
***************
*** 324,327 ****
--- 324,328 ----
      if (!m_isKey) {
        m_isKey = true;
+       m_rootView.setNeedsDisplay(true);
        if (m_firstResponder == null || m_firstResponder == this) {
          if (m_initialFirstResponder != null) {
***************
*** 363,366 ****
--- 364,368 ----
        }
        m_isKey = false;
+       m_rootView.setNeedsDisplay(true);
        m_notificationCenter.postNotificationWithNameObject(NSWindowDidResignKeyNotification, this);
      }