Commit 8a0dab38 authored by Divan Burger's avatar Divan Burger Committed by Alexandre Julliard

comdlg32: Clamp hue and saturation when clicking in colour graph in colour dialog.

parent 19ed5849
...@@ -337,8 +337,10 @@ static int CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *vert ...@@ -337,8 +337,10 @@ static int CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *vert
ClientToScreen(hDlg, &point); ClientToScreen(hDlg, &point);
hwnd = GetDlgItem( hDlg, dlgitem ); hwnd = GetDlgItem( hDlg, dlgitem );
GetWindowRect(hwnd, &rect); GetWindowRect(hwnd, &rect);
if (PtInRect(&rect, point))
{ if (!PtInRect(&rect, point))
return 0;
GetClientRect(hwnd, &rect); GetClientRect(hwnd, &rect);
ScreenToClient(hwnd, &point); ScreenToClient(hwnd, &point);
...@@ -347,14 +349,17 @@ static int CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *vert ...@@ -347,14 +349,17 @@ static int CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *vert
y = (long) (rect.bottom - point.y) * MAXVERT; y = (long) (rect.bottom - point.y) * MAXVERT;
y /= rect.bottom; y /= rect.bottom;
if (x < 0) x = 0;
if (y < 0) y = 0;
if (x > MAXHORI) x = MAXHORI;
if (y > MAXVERT) y = MAXVERT;
if (hori) if (hori)
*hori = x; *hori = x;
if (vert) if (vert)
*vert = y; *vert = y;
return 1; return 1;
}
else
return 0;
} }
/*********************************************************************** /***********************************************************************
* CC_MouseCheckResultWindow [internal] * CC_MouseCheckResultWindow [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