[Actionstep-commits] actionstep/src/org/actionstep NSWindow.as,1.27,1.28 NSApplication.as,1.27,1.28 ASRootWindowView.as,1.16,1.17

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

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

Modified Files:
	NSWindow.as NSApplication.as ASRootWindowView.as 
Log Message:
change key/main window to be the first created window, added ability to hide resize indicators 

Index: ASRootWindowView.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/ASRootWindowView.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ASRootWindowView.as	15 Jul 2005 22:36:25 -0000	1.16
--- ASRootWindowView.as	19 Jul 2005 21:55:53 -0000	1.17
***************
*** 63,66 ****
--- 63,67 ----
    
    private var m_resizeClip:MovieClip;
+   private var m_showsResizeIndicator:Boolean;
  
    // For flash 8
***************
*** 72,75 ****
--- 73,77 ----
      m_swfLoading = false;
      m_swfLoaded = false;
+     m_showsResizeIndicator = true;
      m_titleRect = new NSRect(0,0,0,22);
      m_resizeRect = new NSRect(-11,-11,11,11);
***************
*** 95,139 ****
          
          m_resizeClip = m_mcBounds.createEmptyMovieClip("ResizeClip", 1000000);
!         with(m_resizeClip) {
!           beginFill(0xFFFFFF, 1);
!           lineStyle(0, 0xFFFFFF, 1);
!           moveTo(0,0);
!           lineTo(10,0);
!           lineTo(10,10);
!           lineTo(0,10);
!           lineTo(0,0);
!           endFill();
! 
!           //da 87 e8 ff
!           lineStyle(1.5, 0xdadada, 100);
!           moveTo(0,10);
!           lineTo(10,0);
!           lineStyle(1.5, 0x878787, 100);
!           moveTo(1,10);
!           lineTo(10,1);
!           lineStyle(1.5, 0xe8e8e8, 100);
!           moveTo(2,10);
!           lineTo(10,2);
! 
!           lineStyle(1.5, 0xdadada, 100);
!           moveTo(4,10);
!           lineTo(10,4);
!           lineStyle(1.5, 0x878787, 100);
!           moveTo(5,10);
!           lineTo(10,5);
!           lineStyle(1.5, 0xe8e8e8, 100);
!           moveTo(6,10);
!           lineTo(10,6);
! 
!           lineStyle(1.5, 0xdadada, 100);
!           moveTo(8,10);
!           lineTo(10,8);
!           lineStyle(1.5, 0x878787, 100);
!           moveTo(9,10);
!           lineTo(10,9);
!           lineStyle(1.5, 0xe8e8e8, 100);
!           moveTo(10,10);
!           lineTo(10,10);
!         }
          m_resizeClip.view = this;
          m_resizeClip._x = m_frame.size.width-12;
--- 97,101 ----
          
          m_resizeClip = m_mcBounds.createEmptyMovieClip("ResizeClip", 1000000);
!         drawResizeClip();
          m_resizeClip.view = this;
          m_resizeClip._x = m_frame.size.width-12;
***************
*** 145,148 ****
--- 107,158 ----
    }
    
+   private function drawResizeClip() {
+     with(m_resizeClip) {
+       clear();
+       beginFill(0xFFFFFF, 1);
+       lineStyle(0, 0xFFFFFF, 1);
+       moveTo(0,0);
+       lineTo(10,0);
+       lineTo(10,10);
+       lineTo(0,10);
+       lineTo(0,0);
+       endFill();
+     }
+     if (m_showsResizeIndicator) {
+       with(m_resizeClip) {
+         //da 87 e8 ff
+         lineStyle(1.5, 0xdadada, 100);
+         moveTo(0,10);
+         lineTo(10,0);
+         lineStyle(1.5, 0x878787, 100);
+         moveTo(1,10);
+         lineTo(10,1);
+         lineStyle(1.5, 0xe8e8e8, 100);
+         moveTo(2,10);
+         lineTo(10,2);
+ 
+         lineStyle(1.5, 0xdadada, 100);
+         moveTo(4,10);
+         lineTo(10,4);
+         lineStyle(1.5, 0x878787, 100);
+         moveTo(5,10);
+         lineTo(10,5);
+         lineStyle(1.5, 0xe8e8e8, 100);
+         moveTo(6,10);
+         lineTo(10,6);
+ 
+         lineStyle(1.5, 0xdadada, 100);
+         moveTo(8,10);
+         lineTo(10,8);
+         lineStyle(1.5, 0x878787, 100);
+         moveTo(9,10);
+         lineTo(10,9);
+         lineStyle(1.5, 0xe8e8e8, 100);
+         moveTo(10,10);
+         lineTo(10,10);
+       }
+     }
+   }
+   
    public function removeFromSuperview() {
      removeMovieClips();
***************
*** 418,421 ****
--- 428,432 ----
      var width:Number = event.mouseLocation.x - m_trackingData.origin.x + m_trackingData.offsetX;
      var height:Number = event.mouseLocation.y - m_trackingData.origin.y + m_trackingData.offsetY;
+     /* don't constrain here, constrain in NSWindow
      if (width < m_titleTextField.textWidth+30) {
        width = m_titleTextField.textWidth+30;
***************
*** 423,430 ****
      if (height < 24) {
        height = 24;
!     }
      m_window.setFrame(new NSRect(m_trackingData.origin.x, m_trackingData.origin.y, width, height));
      NSApplication.sharedApplication().callObjectSelectorWithNextEventMatchingMaskDequeue(this, "resizeWindowCallback", m_trackingData.eventMask, true);
    }
    
    public function drawRect(rect:NSRect) {
--- 434,452 ----
      if (height < 24) {
        height = 24;
!     }*/
      m_window.setFrame(new NSRect(m_trackingData.origin.x, m_trackingData.origin.y, width, height));
      NSApplication.sharedApplication().callObjectSelectorWithNextEventMatchingMaskDequeue(this, "resizeWindowCallback", m_trackingData.eventMask, true);
    }
+ 
+   public function showsResizeIndicator():Boolean {
+     return m_showsResizeIndicator;
+   }
+ 
+   public function setShowsResizeIndicator(value:Boolean) {
+     if (m_showsResizeIndicator != value) {
+       m_showsResizeIndicator = value;
+       drawResizeClip();
+     }
+   }
    
    public function drawRect(rect:NSRect) {

Index: NSApplication.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSApplication.as,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NSApplication.as	18 Jul 2005 03:52:20 -0000	1.27
--- NSApplication.as	19 Jul 2005 21:55:53 -0000	1.28
***************
*** 283,286 ****
--- 283,288 ----
      ASEventMonitor.instance().trackMouseEvents();
      ASEventMonitor.instance().trackKeyboardEvents();
+     wins[0].makeKeyWindow();
+     wins[0].makeMainWindow();
      //! What else should we do in run?
      m_active = true;

Index: NSWindow.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSWindow.as,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NSWindow.as	19 Jul 2005 03:57:35 -0000	1.27
--- NSWindow.as	19 Jul 2005 21:55:53 -0000	1.28
***************
*** 170,175 ****
      m_rootView = (new ASRootWindowView()).initWithFrameWindow(m_frameRect, this);
      setContentView((new NSView()).initWithFrame(NSRect.withOriginSize(convertScreenToBase(m_contentRect.origin), m_contentRect.size)));
-     makeKeyWindow();
-     makeMainWindow();
      return this;
    }
--- 170,173 ----
***************
*** 302,305 ****
--- 300,311 ----
      m_contentView.setFrame(NSRect.withOriginSize(convertScreenToBase(m_contentRect.origin), m_contentRect.size));
    }
+ 
+   public function showsResizeIndicator():Boolean {
+     return m_rootView.showsResizeIndicator();
+   }
+ 
+   public function setShowsResizeIndicator(value:Boolean) {
+     m_rootView.setShowsResizeIndicator(value);
+   }
    
    // Constraining window size