scroll bar tweaks from nara

Author: K4sum1

widget/ScrollbarDrawing.cpp

@@ -385,8 +385,8 @@ bool ScrollbarDrawing::PaintScrollbarButton(
                        ColorPattern(ToDeviceColor(buttonColor)));
 
   // Start with Up arrow.
-  float arrowPolygonX[] = {-4.0f, 0.0f, 4.0f, 4.0f, 0.0f, -4.0f};
-  float arrowPolygonY[] = {0.0f, -4.0f, 0.0f, 3.0f, -1.0f, 3.0f};
+  float arrowPolygonX[] = {5.0, 8.5, 12.0, 12.0, 8.5, 5.0};
+  float arrowPolygonY[] = {9.0, 6.0, 9.0, 12.0, 9.0, 12.0};
 
   const float kPolygonSize = 17;
 
@@ -396,7 +396,7 @@ bool ScrollbarDrawing::PaintScrollbarButton(
       break;
     case StyleAppearance::ScrollbarbuttonDown:
       for (int32_t i = 0; i < arrowNumPoints; i++) {
-        arrowPolygonY[i] *= -1;
+        arrowPolygonY[i] = kPolygonSize - arrowPolygonY[i];
       }
       break;
     case StyleAppearance::ScrollbarbuttonLeft:
@@ -409,15 +409,35 @@ bool ScrollbarDrawing::PaintScrollbarButton(
     case StyleAppearance::ScrollbarbuttonRight:
       for (int32_t i = 0; i < arrowNumPoints; i++) {
         float temp = arrowPolygonX[i];
-        arrowPolygonX[i] = arrowPolygonY[i] * -1;
+        arrowPolygonX[i] = kPolygonSize - arrowPolygonY[i];
         arrowPolygonY[i] = temp;
       }
       break;
     default:
       return false;
   }
-  ThemeDrawing::PaintArrow(aDrawTarget, aRect, arrowPolygonX, arrowPolygonY,
-                           kPolygonSize, arrowNumPoints, arrowColor);
+
+  // Compute the path and draw the scrollbar.
+  const float scale = ThemeDrawing::ScaleToFillRect(aRect, kPolygonSize);
+  RefPtr<gfx::PathBuilder> builder = aDrawTarget.CreatePathBuilder();
+  gfx::Point start =
+      gfx::Point(aRect.X(), aRect.Y());
+  gfx::Point p =
+      start + gfx::Point(arrowPolygonX[0] * scale, arrowPolygonY[0] * scale);
+  builder->MoveTo(p);
+  for (int32_t i = 1; i < arrowNumPoints; i++) {
+    p = start +
+        gfx::Point(arrowPolygonX[i] * scale, arrowPolygonY[i] * scale);
+    builder->LineTo(p);
+  }
+  RefPtr<gfx::Path> path = builder->Finish();
+
+  // The arrow should be drawn without antialiasing.
+  DrawOptions arrowOptions(
+    1.0f, gfx::CompositionOp::OP_OVER, gfx::AntialiasMode::NONE
+  );
+
+  aDrawTarget.Fill(path, gfx::ColorPattern(ToDeviceColor(arrowColor)), arrowOptions);
   return true;
 }
 

widget/windows/nsNativeThemeWin.cpp

@@ -2817,11 +2817,8 @@ LayoutDeviceIntSize nsNativeThemeWin::ClassicGetMinimumWidgetSize(
       break;
     case StyleAppearance::ScrollbarbuttonLeft:
     case StyleAppearance::ScrollbarbuttonRight:
-      // For scrollbar-width:thin, we don't display the buttons.
-      if (!ScrollbarDrawing::IsScrollbarWidthThin(aFrame)) {
-        result.width = ::GetSystemMetrics(SM_CXHSCROLL);
-        result.height = ::GetSystemMetrics(SM_CYHSCROLL);
-      }
+      result.width = ::GetSystemMetrics(SM_CYHSCROLL);
+      result.height = ::GetSystemMetrics(SM_CYHSCROLL);
       break;
     case StyleAppearance::ScrollbarVertical:
     case StyleAppearance::ScrollbarHorizontal: