[Actionstep-commits] actionstep/src/org/actionstep NSScroller.as,1.9,1.10

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

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

Modified Files:
	NSScroller.as 
Log Message:
got scroller working...yeah!


Index: NSScroller.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSScroller.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NSScroller.as	26 May 2005 20:35:50 -0000	1.9
--- NSScroller.as	27 May 2005 20:52:37 -0000	1.10
***************
*** 77,81 ****
      m_enabled = true;
      m_pendingKnobProportion = 0;
!     m_scrollerKnobClipRect = NSRect.ZeroRect;
    }
    
--- 77,81 ----
      m_enabled = true;
      m_pendingKnobProportion = 0;
!     m_scrollerKnobClipRect = new NSRect(0,0,0,0);
    }
    
***************
*** 564,577 ****
      if (m_scrollerKnobClipRect.origin.x != rectKnob.origin.x ||
          m_scrollerKnobClipRect.origin.y != rectKnob.origin.y) {
-       m_scrollerKnobClip._x = rectKnob.origin.x;
-       m_scrollerKnobClip._y = rectKnob.origin.y;
        m_scrollerKnobClipRect.origin.x = rectKnob.origin.x;
        m_scrollerKnobClipRect.origin.y = rectKnob.origin.y;
      }
      if (m_scrollerKnobClipRect.size.width != rectKnob.size.width ||
!         m_scrollerKnobClipRect.size.width != rectKnob.size.height) {
        m_scrollerKnobClipRect.size.width = rectKnob.size.width;
!       m_scrollerKnobClipRect.size.width = rectKnob.size.height;
        m_scrollerKnobClip.clear();
        ASTheme.current().drawScrollerWithRectInClip(new NSRect(0,0,rectKnob.size.width, rectKnob.size.height), m_scrollerKnobClip);
      }
--- 564,578 ----
      if (m_scrollerKnobClipRect.origin.x != rectKnob.origin.x ||
          m_scrollerKnobClipRect.origin.y != rectKnob.origin.y) {
        m_scrollerKnobClipRect.origin.x = rectKnob.origin.x;
        m_scrollerKnobClipRect.origin.y = rectKnob.origin.y;
+       m_scrollerKnobClip._x = rectKnob.origin.x;
+       m_scrollerKnobClip._y = rectKnob.origin.y;
      }
      if (m_scrollerKnobClipRect.size.width != rectKnob.size.width ||
!         m_scrollerKnobClipRect.size.height != rectKnob.size.height) {
        m_scrollerKnobClipRect.size.width = rectKnob.size.width;
!       m_scrollerKnobClipRect.size.height = rectKnob.size.height;
        m_scrollerKnobClip.clear();
+       TRACE("drawing knob "+m_scrollerKnobClipRect );
        ASTheme.current().drawScrollerWithRectInClip(new NSRect(0,0,rectKnob.size.width, rectKnob.size.height), m_scrollerKnobClip);
      }