Changeset 51909 in webkit

Timestamp:

Dec 9, 2009 11:52:28 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-09 Avi Drissman <​avi@chromium.org>

Reviewed by Darin Fisher.

Chromium tickmarks in scrollbar now UX approved.
​https://bugs.webkit.org/show_bug.cgi?id=32069

• platform/chromium/ScrollbarThemeChromiumMac.mm: (WebCore::ScrollbarThemeChromiumMac::paint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ScrollbarThemeChromiumMac.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-09  Avi Drissman  <avi@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Chromium tickmarks in scrollbar now UX approved.
+        https://bugs.webkit.org/show_bug.cgi?id=32069
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2009-12-09  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

@@ -416 +416 @@
     scrollbar->client()->getTickmarks(tickmarks);
     if (scrollbar->orientation() == VerticalScrollbar && tickmarks.size()) {
-        static RefPtr<Image> dash = Image::loadPlatformResource("tickmarkDash");
-        if (dash->isNull()) {
-            ASSERT_NOT_REACHED();
-        }
-
         drawingContext->save();
+        drawingContext->setShouldAntialias(false);
+        drawingContext->setStrokeColor(Color(0xCC, 0xAA, 0x00, 0xFF), DeviceColorSpace);
+        drawingContext->setFillColor(Color(0xFF, 0xDD, 0x00, 0xFF), DeviceColorSpace);
 
         IntRect thumbArea = trackRect(scrollbar, false);
@@ -429 +427 @@
         }
         // The ends are rounded and the thumb doesn't go there.
-        thumbArea.inflateY(-thumbArea.width() * 2 / 3);
+        thumbArea.inflateY(-thumbArea.width());
 
         for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
             // Calculate how far down (in %) the tick-mark should appear.
             const float percent = static_cast<float>(i->y()) / scrollbar->totalSize();
+            if (percent < 0.0 || percent > 1.0)
+              continue;
 
             // Calculate how far down (in pixels) the tick-mark should appear.
-            const int yPos = thumbArea.topLeft().y() + (thumbArea.height() * percent);
-
-            IntPoint tick(thumbArea.topLeft().x(), yPos);
-            drawingContext->drawImage(dash.get(), DeviceColorSpace, tick);
+            const int yPos = static_cast<int>((thumbArea.topLeft().y() + (thumbArea.height() * percent))) & ~1;
+
+            // Paint.
+            const int indent = 2;
+            FloatRect tickRect(thumbArea.topLeft().x() + indent, yPos, thumbArea.width() - 2 * indent - 1, 2);
+            drawingContext->fillRect(tickRect);
+            drawingContext->strokeRect(tickRect, 1);
         }