[Actionstep-commits] actionstep/src/org/actionstep NSScroller.as,1.2,1.3

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

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

Modified Files:
	NSScroller.as 
Log Message:
got buttons rendering


Index: NSScroller.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSScroller.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NSScroller.as	21 May 2005 04:23:43 -0000	1.2
--- NSScroller.as	22 May 2005 03:35:37 -0000	1.3
***************
*** 29,32 ****
--- 29,34 ----
   */
  
+ import org.actionstep.ASDraw;
+ 
  import org.actionstep.NSControl;
  import org.actionstep.NSRect;
***************
*** 102,106 ****
      m_hitPart = NSScrollerPart.NSScrollerNoPart;    
      drawParts();
!     setEnabled(false);
      checkSpaceForParts();
      return this;
--- 104,108 ----
      m_hitPart = NSScrollerPart.NSScrollerNoPart;    
      drawParts();
!     setEnabled(true);
      checkSpaceForParts();
      return this;
***************
*** 225,228 ****
--- 227,232 ----
      var scrollerFrame = m_frame.clone();
      var x:Number, y:Number, width:Number, height:Number;
+     x = y = width = height = 0;
+     
      var buttonsSize = 2*BUTTON_WIDTH+2;
      var usableParts:NSUsableScrollerParts;
***************
*** 278,282 ****
            return NSRect.ZeroRect;
          }
!         y += (height - BUTTON_WIDTH+1);
          width = BUTTON_WIDTH;
          height = BUTTON_WIDTH;
--- 282,287 ----
            return NSRect.ZeroRect;
          }
!         x += 1;
!         y += 1;
          width = BUTTON_WIDTH;
          height = BUTTON_WIDTH;
***************
*** 288,291 ****
--- 293,298 ----
            return NSRect.ZeroRect;
          }
+         x += 1;
+         y += (height - BUTTON_WIDTH+1);
          width = BUTTON_WIDTH;
          height = BUTTON_WIDTH;
***************
*** 386,389 ****
--- 393,397 ----
      g_upCell.setPeriodicDelayInterval(.3, .03);
      g_upCell.setBezelStyle(NSBezelStyle.NSShadowlessSquareBezelStyle);
+     g_upCell.setBezeled(true);
      
      g_downCell = new NSButtonCell();
***************
*** 396,399 ****
--- 404,408 ----
      g_downCell.setPeriodicDelayInterval(.3, .03);
      g_downCell.setBezelStyle(NSBezelStyle.NSShadowlessSquareBezelStyle);
+     g_downCell.setBezeled(true);
      
      g_leftCell = new NSButtonCell();
***************
*** 406,409 ****
--- 415,419 ----
      g_leftCell.setPeriodicDelayInterval(.3, .03);
      g_leftCell.setBezelStyle(NSBezelStyle.NSShadowlessSquareBezelStyle);
+     g_leftCell.setBezeled(true);
      
      g_rightCell = new NSButtonCell();
***************
*** 416,419 ****
--- 426,430 ----
      g_rightCell.setPeriodicDelayInterval(.3, .03);
      g_rightCell.setBezelStyle(NSBezelStyle.NSShadowlessSquareBezelStyle);
+     g_rightCell.setBezeled(true);
    }
    
***************
*** 512,515 ****
--- 523,537 ----
    }
    
+   public function drawRect(rect:NSRect) {
+     ASDraw.outlineRectWithRect(m_mcBounds, rect, [0x696E79,0xF6F8F9]);
+     var rectIncrementLine:NSRect = rectForPart(NSScrollerPart.NSScrollerIncrementLine);
+     var rectDecrementLine:NSRect = rectForPart(NSScrollerPart.NSScrollerDecrementLine);
+     var rectKnobSlot:NSRect  = rectForPart(NSScrollerPart.NSScrollerKnobSlot);
+     var cell:NSButtonCell = (m_horizontal ? g_leftCell : g_upCell);
+     cell.drawWithFrameInView(rectDecrementLine, this);
+     cell = (m_horizontal ? g_rightCell : g_downCell);
+     cell.drawWithFrameInView(rectIncrementLine, this);
+   }
+   
    // Setting control tint