Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMDLG32] ChooseColor: Apply DarkShadow44's suggestions (#6971)

Browse source 
Co-authored-by: Fabian Maurer <dark.shadow4@web.de>

Based on @DarkShadow44's merge
request to WineHQ.
JIRA issue: CORE-19402
Merge Request: https://gitlab.winehq.org/wine/wine/-/merge_requests/5756

Proposed changes
Extend CC_CheckDigitsInEdit's
parameters and set infoPtr->updating
to TRUE when updating.
Call CC_PaintLumBar function in
CC_WMCommand function.
This commit is contained in:
Katayama Hirofumi MZ 2024-09-08 16:59:28 +09:00 committed by GitHub
parent 78e94a5083
commit 8bba3c4333
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dll/win32/comdlg32/colordlg.c
View file

@ -396,7 +396,11 @@ static BOOL CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam )
/***********************************************************************
* CC_CheckDigitsInEdit [internal]
*/
#ifdef __REACTOS__
static int CC_CheckDigitsInEdit( CCPRIV *infoPtr, HWND hwnd, int maxval )
#else
static int CC_CheckDigitsInEdit( HWND hwnd, int maxval )
#endif
{
int i, k, m, result, value;
long editpos;
@ -430,7 +434,13 @@ static int CC_CheckDigitsInEdit( HWND hwnd, int maxval )
if (result)
{
editpos = SendMessageA(hwnd, EM_GETSEL, 0, 0);
#ifdef __REACTOS__
infoPtr->updating = TRUE;
#endif
SetWindowTextA(hwnd, buffer );
#ifdef __REACTOS__
infoPtr->updating = FALSE;
#endif
SendMessageA(hwnd, EM_SETSEL, 0, editpos);
}
return value;
@ -984,7 +994,11 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti
case IDC_COLOR_EDIT_B:
if (notifyCode == EN_UPDATE && !lpp->updating)
{
#ifdef __REACTOS__
i = CC_CheckDigitsInEdit(lpp, hwndCtl, 255);
#else
i = CC_CheckDigitsInEdit(hwndCtl, 255);
#endif
r = GetRValue(lpp->lpcc->rgbResult);
g = GetGValue(lpp->lpcc->rgbResult);
b= GetBValue(lpp->lpcc->rgbResult);
@ -1005,6 +1019,9 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti
CC_EditSetHSL(lpp);
CC_PaintCross(lpp);
CC_PaintTriangle(lpp);
#ifdef __REACTOS__
CC_PaintLumBar(lpp);
#endif
}
}
break;
@ -1014,7 +1031,11 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti
case IDC_COLOR_EDIT_L:
if (notifyCode == EN_UPDATE && !lpp->updating)
{
#ifdef __REACTOS__
i = CC_CheckDigitsInEdit(lpp, hwndCtl , LOWORD(wParam) == IDC_COLOR_EDIT_H ? 239 : 240);
#else
i = CC_CheckDigitsInEdit(hwndCtl , LOWORD(wParam) == IDC_COLOR_EDIT_H ? 239 : 240);
#endif
xx = 0;
switch (LOWORD(wParam))
{