Skip to content

W
wine-winehq
Commit ad92cdcf authored by Divan Burger's avatar Divan Burger Committed by Alexandre Julliard
Browse files
Options

comdlg32: Modernize the look of the colour boxes in the colour dialog.

parent 3a508e60
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
dlls/comdlg32/colordlg.c
View file @ ad92cdcf
...@@ -739,7 +739,7 @@ void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) ...@@ -739,7 +739,7 @@ void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect )
static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
{ {
HWND hwnd = GetDlgItem(hDlg, 0x2d0); HWND hwnd = GetDlgItem(hDlg, 0x2d0);
RECT rect; RECT rect, blockrect;
HDC hdc; HDC hdc;
HBRUSH hBrush; HBRUSH hBrush;
int dx, dy, i, j, k; int dx, dy, i, j, k;
...@@ -762,14 +762,17 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) ...@@ -762,14 +762,17 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
hBrush = CreateSolidBrush(predefcolors[j][i]); hBrush = CreateSolidBrush(predefcolors[j][i]);
if (hBrush) if (hBrush)
{ {
hBrush = SelectObject(hdc, hBrush); blockrect.left = rect.left;
Rectangle(hdc, rect.left, rect.top, blockrect.top = rect.top;
rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); blockrect.right = rect.left + dx - DISTANCE;
rect.left = rect.left + dx; blockrect.bottom = rect.top + dy - DISTANCE;
DeleteObject(SelectObject(hdc, hBrush)) ; 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; rect.left = k;
} }
ReleaseDC(hwnd, hdc); ReleaseDC(hwnd, hdc);
...@@ -783,7 +786,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) ...@@ -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 ) void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr )
{ {
HWND hwnd = GetDlgItem(hDlg, 0x2d1); HWND hwnd = GetDlgItem(hDlg, 0x2d1);
RECT rect; RECT rect, blockrect;
HDC hdc; HDC hdc;
HBRUSH hBrush; HBRUSH hBrush;
int dx, dy, i, j, k; int dx, dy, i, j, k;
...@@ -808,14 +811,17 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr ...@@ -808,14 +811,17 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr
hBrush = CreateSolidBrush(lpcr[i+j*cols]); hBrush = CreateSolidBrush(lpcr[i+j*cols]);
if (hBrush) if (hBrush)
{ {
hBrush = SelectObject(hdc, hBrush) ; blockrect.left = rect.left;
Rectangle(hdc, rect.left, rect.top, blockrect.top = rect.top;
rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); blockrect.right = rect.left + dx - DISTANCE;
rect.left = rect.left + dx; blockrect.bottom = rect.top + dy - DISTANCE;
DeleteObject( SelectObject(hdc, hBrush) ) ; 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; rect.left = k;
} }
ReleaseDC(hwnd, hdc); ReleaseDC(hwnd, hdc);
...@@ -825,7 +831,6 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr ...@@ -825,7 +831,6 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr
} }
/*********************************************************************** /***********************************************************************
* CC_HookCallChk [internal] * CC_HookCallChk [internal]
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment