From ad92cdcf551881133dbdae5effca9961403814e8 Mon Sep 17 00:00:00 2001
From: Divan Burger <divan.burger@gmail.com>
Date: Mon, 7 Jan 2008 19:46:54 +0200
Subject: [PATCH] comdlg32: Modernize the look of the colour boxes in the
 colour dialog.

---
 dlls/comdlg32/colordlg.c | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index 74d33572cce..777b0bd8d2a 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -739,7 +739,7 @@ void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect )
 static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
 {
  HWND hwnd = GetDlgItem(hDlg, 0x2d0);
- RECT rect;
+ RECT rect, blockrect;
  HDC  hdc;
  HBRUSH hBrush;
  int dx, dy, i, j, k;
@@ -762,14 +762,17 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
    hBrush = CreateSolidBrush(predefcolors[j][i]);
    if (hBrush)
    {
-    hBrush = SelectObject(hdc, hBrush);
-    Rectangle(hdc, rect.left, rect.top,
-                rect.left + dx - DISTANCE, rect.top + dy - DISTANCE);
-    rect.left = rect.left + dx;
-    DeleteObject(SelectObject(hdc, hBrush)) ;
+    blockrect.left = rect.left;
+    blockrect.top = rect.top;
+    blockrect.right = rect.left + dx - DISTANCE;
+    blockrect.bottom = rect.top + dy - DISTANCE;
+    FillRect(hdc, &blockrect, hBrush);
+    DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT);
+    DeleteObject(hBrush);
    }
+   rect.left += dx;
   }
-  rect.top = rect.top + dy;
+  rect.top += dy;
   rect.left = k;
  }
  ReleaseDC(hwnd, hdc);
@@ -783,7 +786,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
 void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr )
 {
  HWND hwnd = GetDlgItem(hDlg, 0x2d1);
- RECT rect;
+ RECT rect, blockrect;
  HDC  hdc;
  HBRUSH hBrush;
  int dx, dy, i, j, k;
@@ -808,14 +811,17 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr
     hBrush = CreateSolidBrush(lpcr[i+j*cols]);
     if (hBrush)
     {
-     hBrush = SelectObject(hdc, hBrush) ;
-     Rectangle(hdc, rect.left, rect.top,
-                  rect.left + dx - DISTANCE, rect.top + dy - DISTANCE);
-     rect.left = rect.left + dx;
-     DeleteObject( SelectObject(hdc, hBrush) ) ;
+     blockrect.left = rect.left;
+     blockrect.top = rect.top;
+     blockrect.right = rect.left + dx - DISTANCE;
+     blockrect.bottom = rect.top + dy - DISTANCE;
+     FillRect(hdc, &blockrect, hBrush);
+     DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT);
+     DeleteObject(hBrush);
     }
+    rect.left += dx;
    }
-   rect.top = rect.top + dy;
+   rect.top += dy;
    rect.left = k;
   }
   ReleaseDC(hwnd, hdc);
@@ -825,7 +831,6 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr
 }
 
 
-
 /***********************************************************************
  *                             CC_HookCallChk                 [internal]
  */