Changeset 17823 in webkit

Timestamp:

Nov 16, 2006 4:03:01 PM (17 years ago)

Author:

adele

Message:

Reviewed by Adam.

Slider cleanup. Let the theme set the size of the slider thumb.

• rendering/RenderSlider.cpp: (WebCore::RenderSlider::setStyle): Moving the thumb's appearance adjustment to createThumbStyle. (WebCore::RenderSlider::createThumbStyle): (WebCore::RenderSlider::layout): Let the theme set the size of the thumb.
• rendering/RenderTheme.cpp: (WebCore::RenderTheme::adjustSliderThumbSize): Added.
• rendering/RenderTheme.h: ditto.
• rendering/RenderThemeMac.h: ditto.
• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::adjustSliderThumbSize): ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• rendering/RenderSlider.cpp (modified) (5 diffs)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeMac.h (modified) (2 diffs)
• rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-16  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Adam.
+
+        Slider cleanup.  Let the theme set the size of the slider thumb.
+
+        * rendering/RenderSlider.cpp:
+        (WebCore::RenderSlider::setStyle): Moving the thumb's appearance adjustment to createThumbStyle.
+        (WebCore::RenderSlider::createThumbStyle):
+        (WebCore::RenderSlider::layout): Let the theme set the size of the thumb.
+        * rendering/RenderTheme.cpp: (WebCore::RenderTheme::adjustSliderThumbSize):  Added.
+        * rendering/RenderTheme.h: ditto.
+        * rendering/RenderThemeMac.h: ditto.
+        * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::adjustSliderThumbSize): ditto.
+
 2006-11-15  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -10641 +10641 @@
                         productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                         projectDirPath = "";
-                        projectRoot = "";
                         targets = (
                                 93F198A508245E59001E9ABC /* WebCore */,

trunk/WebCore/rendering/RenderSlider.cpp

@@ -32 +32 @@
 #include "HTMLNames.h"
 #include "MouseEvent.h"
+#include "RenderTheme.h"
 #include <wtf/MathExtras.h>
 
@@ -161 +162 @@
     
     RenderStyle* thumbStyle = createThumbStyle(newStyle);
+
     if (m_thumb)
         m_thumb->renderer()->setStyle(thumbStyle);
-        
-    if (newStyle->appearance() == SliderVerticalAppearance)
-        thumbStyle->setAppearance(SliderThumbVerticalAppearance);
-     else
-        thumbStyle->setAppearance(SliderThumbHorizontalAppearance);
         
     setReplaced(isInline());
@@ -184 +181 @@
     style->setPosition(RelativePosition);
 
+    if (parentStyle->appearance() == SliderVerticalAppearance)
+       style->setAppearance(SliderThumbVerticalAppearance);
+    else if (parentStyle->appearance() == SliderHorizontalAppearance)
+       style->setAppearance(SliderThumbHorizontalAppearance);
+
     return style;
 }
@@ -192 +194 @@
     
     if (m_thumb && m_thumb->renderer()) {
+            
         int oldWidth = m_width;
         calcWidth();
@@ -200 +203 @@
             relayoutChildren = true;  
 
+        // Allow the theme to set the size of the thumb
+        if (m_thumb->renderer()->style()->hasAppearance())
+            theme()->adjustSliderThumbSize(m_thumb->renderer());
+
         if (style()->appearance() == SliderVerticalAppearance)
             m_thumb->renderer()->style()->setLeft(Length(m_width / 2 - m_thumb->renderer()->style()->width().value() / 2, Fixed));
         else
             m_thumb->renderer()->style()->setTop(Length(m_height / 2 - m_thumb->renderer()->style()->height().value() / 2, Fixed));
-        
+
         if (relayoutChildren)
             setPositionFromValue(true);

trunk/WebCore/rendering/RenderTheme.cpp

@@ -412 +412 @@
 }
 
-}
+void RenderTheme::adjustSliderThumbSize(RenderObject*) const
+{
+}
+
+}

trunk/WebCore/rendering/RenderTheme.h

@@ -114 +114 @@
     virtual int minimumMenuListSize(RenderStyle*) const { return 0; }
 
+    virtual void adjustSliderThumbSize(RenderObject*) const;
+
 protected:
     // Methods for state querying

trunk/WebCore/rendering/RenderThemeMac.h

@@ -61 +61 @@
 
     virtual int minimumMenuListSize(RenderStyle*) const;
+    
+    virtual void adjustSliderThumbSize(RenderObject*) const;
 
 protected:
@@ -86 +88 @@
     virtual void adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     
-    virtual void adjustSliderTrackStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     virtual bool paintSliderTrack(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+    virtual bool paintSliderThumb(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
 
-    virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
-    virtual bool paintSliderThumb(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
-    
 private:
     IntRect inflateRect(const IntRect&, const IntSize&, const int* margins) const;

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -1031 +1031 @@
 }
 
-void RenderThemeMac::adjustSliderTrackStyle(CSSStyleSelector*, RenderStyle* style, Element* e) const
-{
-}
-
 const int sliderThumbWidth = 15;
 const int sliderThumbHeight = 15;
 
-void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element* e) const
-{
-    style->setWidth(Length(sliderThumbWidth, Fixed));
-    style->setHeight(Length(sliderThumbHeight, Fixed));
-}
-
-}
+void RenderThemeMac::adjustSliderThumbSize(RenderObject* o) const
+{
+    if (o->style()->appearance() == SliderThumbHorizontalAppearance || o->style()->appearance() == SliderThumbVerticalAppearance) {
+        o->style()->setWidth(Length(sliderThumbWidth, Fixed));
+        o->style()->setHeight(Length(sliderThumbHeight, Fixed));
+    }
+}
+
+}