more native scrollbar fixes and cleanup. horizontal scrollbars now work

correctly. adjusted scrollwheel code to not obscure cursor on scrollwheel.
Not part of build.

widget/src/cocoa/nsChildView.mm

@@ -1926,7 +1926,7 @@ const PRInt32 kNumLines = 8;
 {
   // XXXdwh. We basically always get 1 or -1 as the delta.  This is treated by 
   // Gecko as the number of lines to scroll.  We go ahead and use a 
-  // default kNumLines of 4 for now (until I learn how we can get settings from
+  // default kNumLines of 8 for now (until I learn how we can get settings from
   // the OS). --dwh
   nsMouseScrollEvent geckoEvent;
   geckoEvent.eventStructType = NS_MOUSE_SCROLL_EVENT;
@@ -1934,9 +1934,6 @@ const PRInt32 kNumLines = 8;
   geckoEvent.delta = PRInt32([theEvent deltaY])*(-kNumLines);
   geckoEvent.scrollFlags |= nsMouseScrollEvent::kIsVertical;
  
-  // obscure the cursor during a wheel scroll
-  ::ObscureCursor();
-
   // send event into Gecko by going directly to the
   // the widget.
   mGeckoChild->DispatchWindowEvent(geckoEvent);

widget/src/cocoa/nsNativeScrollbar.h

@@ -55,11 +55,6 @@ class nsIScrollbarMediator;
 // with a stub gecko frame to scroll in the GFXScrollFrame mechanism
 //
 
-// {c2281100-3b4b-11d6-a384-f705fd0766fc}
-#define NS_NATIVESCROLLBAR_CID \
-{ 0xc2281100, 0x3b4b, 0x11d6, { 0xa3, 0x84, 0xf7, 0x05, 0xfd, 0x07, 0x66, 0xfc } }
-
-
 class nsNativeScrollbar : public nsChildView, public nsINativeScrollbar
 {
 private:
@@ -87,6 +82,8 @@ protected:
   NSScroller* GetControl() { return mView; }
 
   void UpdateContentPosition(PRUint32 inNewPos);
+  
+  void RecreateHorizontalScrollbar();
 
   virtual NSView*   CreateCocoaView() ;
   virtual GrafPtr   GetQuickDrawPort() ;

widget/src/cocoa/nsNativeScrollbar.mm

@@ -42,6 +42,7 @@
 #include <ControlDefinitions.h>
 #endif
 
+#include "nsReadableUtils.h"
 #include "nsWidgetAtoms.h"
 #include "nsWatchTask.h"
 #include "nsINameSpaceManager.h"
@@ -69,23 +70,24 @@ nsNativeScrollbar::~nsNativeScrollbar()
 }
 
 
+//
+// CreateCocoaView
+//
+// Create a NativeScrollbarView for insertion into the cocoa view hierarchy.
+// Cocoa sets the orientation of a scrollbar at creation time by looking
+// at its frame and taking the longer side to be the orientation. Since
+// chances are good at this point gecko just wants us to be 1x1, assume
+// we're going to be vertical. If later when we get a content node assigned
+// we find we're horizontal, we can update then.
+//
 NSView*
 nsNativeScrollbar::CreateCocoaView ( )
 {
-  // Cocoa sets the orientation of a scrollbar at creation time by looking
-  // at its frame and taking the longer side to be the orientation. Since
-  // chances are good at this point gecko just wants us to be 1x1, use
-  // the flag at creation to force the desired orientation.
   NSRect orientation;
   orientation.origin.x = orientation.origin.y = 0;
-  if ( 1 ) {
-    orientation.size.width = 20;
-    orientation.size.height = 100;
-  }
-  else {
-    orientation.size.width = 100;
-    orientation.size.height = 20;
-  }
+  orientation.size.width = 20;
+  orientation.size.height = 100;
+
   return [[[NativeScrollbarView alloc] initWithFrame:orientation geckoChild:this] autorelease];
 }
 
@@ -222,12 +224,13 @@ nsNativeScrollbar::UpdateContentPosition(PRUint32 inNewPos)
 }
 
 
-/**-------------------------------------------------------------------------------
- * DispatchMouseEvent handle an event for this scrollbar
- * @update  dc 08/31/98
- * @Param aEvent -- The mouse event to respond to for this button
- * @return -- True if the event was handled, PR_FALSE if we did not handle it.
- */ 
+
+//
+// DispatchMouseEvent
+//
+// We don't need to do much here, cocoa will handle tracking the mouse for us. Returning
+// true means that the event is handled.
+//
 PRBool
 nsNativeScrollbar::DispatchMouseEvent(nsMouseEvent &aEvent)
 {
@@ -279,9 +282,19 @@ nsNativeScrollbar::SetPosition(PRUint32 aPos)
   if ((PRInt32)aPos < 0)
     aPos = 0;
 
-  mValue = ((PRInt32)aPos) > mMaxValue ? mMaxValue : ((int)aPos);
-  [mView setFloatValue:(aPos / (float)mMaxValue)];
-
+  // while we _should_ be ensuring that we don't set our value higher
+  // than our max value, the gfx scrollview code plays fast and loose
+  // with the rules while going back/forward and adjusts the value to the
+  // previous value long before it sets the max. As a result, we would
+  // lose the given value (since max would most likely be 0). The only
+  // way around that is to relax our restrictions a little bit. (bug 135191)
+  //   mValue = ((PRInt32)aPos) > mMaxValue ? mMaxValue : ((int)aPos);
+  mValue = aPos;
+  if ( mMaxValue )
+    [mView setFloatValue:(aPos / (float)mMaxValue)];
+  else
+    [mView setFloatValue:0.0];
+    
   return NS_OK;
 }
 
@@ -313,7 +326,6 @@ nsNativeScrollbar::SetViewSize(PRUint32 aSize)
   
   PRInt32 fullVisibleArea = mVisibleImageSize + mMaxValue;
   [mView setFloatValue:[mView floatValue] knobProportion:(mVisibleImageSize / (float)fullVisibleArea)];
-  
   return NS_OK;
 }
 
@@ -388,10 +400,56 @@ nsNativeScrollbar::SetContent(nsIContent* inContent, nsIScrollbarMediator* inMed
 {
   mContent = inContent;
   mMediator = inMediator;
+  
+  if ( mContent ) {
+    // we may have to re-create the scrollbar view as horizontal. Check the
+    // 'orient' attribute and rebuild the view with all the settings
+    // present in the current view
+    nsAutoString orient;
+    mContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::orient, orient);
+    if ( orient.Equals(NS_LITERAL_STRING("horizontal")) )
+      RecreateHorizontalScrollbar();
+  }
+  
   return NS_OK;
 }
 
 
+//
+// RecreateHorizontalScrollbar
+//
+// Replace the vertical scroller we created earlier with a horizontal scroller
+// of the same dimensions and values
+//
+void
+nsNativeScrollbar::RecreateHorizontalScrollbar()
+{
+  // set framerect so that cocoa thinks it's a horizontal scroller
+  NSRect orientation;
+  orientation.origin.x = orientation.origin.y = 0;
+  orientation.size.width = 100;
+  orientation.size.height = 16;
+  
+  // save off the old values and get rid of the previous view. Hiding
+  // it removes it from the parent hierarchy.
+  NSRect oldBounds = [mView bounds];
+  float oldValue = [mView floatValue];
+  float oldProportion = [mView knobProportion];
+  mVisible = PR_TRUE;														// ensure that hide does the work
+  Show(PR_FALSE);
+  [mView release];
+  
+  // create the new horizontal scroller, init it, hook it up to the
+  // view hierarchy and reset the values.
+  mView = [[[NativeScrollbarView alloc] initWithFrame:orientation geckoChild:this] retain];
+  [mView setNativeWindow: [mParentView getNativeWindow]];
+  [mView setFrame:oldBounds];
+  [mView setFloatValue:oldValue knobProportion:oldProportion];
+  Show(PR_TRUE);
+  Enable(PR_TRUE);
+}
+
+
 //
 // Show
 //