[PATCH 1/6] comctl32/trackbar: Add a helper to get the pen color for drawing tics.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 dlls/comctl32/trackbar.c | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 978fb283b7a..fb337202d9f 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -561,21 +561,35 @@ TRACKBAR_DrawTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags)
         TRACKBAR_DrawOneTic (infoPtr, hdc, ticPos, flags & ~TBS_LEFT);
 }

-static void
-TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc)
+static COLORREF TRACKBAR_GetTicPenColor(const TRACKBAR_INFO *infoPtr)
 {
-    unsigned int i;
-    int ticFlags = infoPtr->dwStyle & 0x0f;
-    LOGPEN ticPen = { PS_SOLID, {1, 0}, GetSysColor (COLOR_3DDKSHADOW) };
-    HPEN hOldPen, hTicPen;
     HTHEME theme = GetWindowTheme (infoPtr->hwndSelf);
-    
+
     if (theme)
     {
         int part = (infoPtr->dwStyle & TBS_VERT) ? TKP_TICSVERT : TKP_TICS;
-        GetThemeColor (theme, part, TSS_NORMAL, TMT_COLOR, &ticPen.lopnColor);
+        COLORREF color;
+
+        GetThemeColor (theme, part, TSS_NORMAL, TMT_COLOR, &color);
+        return color;
     }
+
+    return GetSysColor (COLOR_3DDKSHADOW);
+}
+
+static void
+TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc)
+{
+    unsigned int i;
+    int ticFlags = infoPtr->dwStyle & 0x0f;
+    LOGPEN ticPen;
+    HPEN hOldPen, hTicPen;
+
     /* create the pen to draw the tics with */
+    ticPen.lopnStyle = PS_SOLID;
+    ticPen.lopnWidth.x = 1;
+    ticPen.lopnWidth.y = 0;
+    ticPen.lopnColor = TRACKBAR_GetTicPenColor(infoPtr);
     hTicPen = CreatePenIndirect(&ticPen);
     hOldPen = hTicPen ? SelectObject(hdc, hTicPen) : 0;