Changeset 92319 in webkit

Timestamp:

Aug 3, 2011 3:42:46 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Chromium Mac: Fix position of search tickmarks
​https://bugs.webkit.org/show_bug.cgi?id=65575

This change adjusts the position of search tickmarks so that they are correctly centered.

Also, insetting the tickmark rect by 5 pixels caused tickmarks on the overlay scrollbar to look very small. I changed this to inset by 4 pixels instead. The tickmark is the same width as the overlay scrollbar which looks much better.

Patch by Sailesh Agrawal <​sail@chromium.org> on 2011-08-03
Reviewed by James Robinson.

• platform/chromium/ScrollbarThemeChromiumMac.mm:

(WebCore::ScrollbarThemeChromiumMac::paint):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-03  Sailesh Agrawal  <sail@chromium.org>
+
+        Chromium Mac: Fix position of search tickmarks
+        https://bugs.webkit.org/show_bug.cgi?id=65575
+
+        This change adjusts the position of search tickmarks so that they are correctly centered.
+
+        Also, insetting the tickmark rect by 5 pixels caused tickmarks on the overlay scrollbar to look very small. I changed this to inset by 4 pixels instead. The tickmark is the same width as the overlay scrollbar which looks much better.
+
+        Reviewed by James Robinson.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2011-08-03  Sailesh Agrawal  <sail@chromium.org>
 

trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

@@ -492 +492 @@
 
         IntRect tickmarkTrackRect(IntPoint(), trackRect(scrollbar, false).size());
-        // Inset by 2 on the left and 3 on the right.
-        tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
-        tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 3);
+        if (tickmarkTrackRect.width() <= 10) {
+            // For narrow scrollbars inset by 1 on the left and 3 on the right.
+            tickmarkTrackRect.setX(tickmarkTrackRect.x() + 1);
+            tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 4);
+        } else {
+            // For wide scrollbars inset by 2 on the left and 3 on the right.
+            tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
+            tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 5);
+        }
         paintTickmarks(context, scrollbar, tickmarkTrackRect);
 
@@ -567 +573 @@
     // Inset by 2 on the left and 3 on the right.
     tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
-    tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 3);
+    tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 5);
     paintTickmarks(drawingContext, scrollbar, tickmarkTrackRect);