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

[OSK] Hotfix for PR #1536 (#1549)

Browse source 
CORE-15965
This commit is contained in:
Bișoc George 2019-05-01 10:33:13 +02:00 committed by Hermès Bélusca-Maïto
parent 575ab6c760
commit f8b90805ff
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
base/applications/osk/main.c
View file

@ -181,7 +181,7 @@ int OSK_DlgInitDialog(HWND hDlg)
GetMonitorInfoW(monitor, &info); GetMonitorInfoW(monitor, &info);
GetWindowRect(hDlg, &rcWindow); GetWindowRect(hDlg, &rcWindow);
/* /*
If the coordination values are default then re-initialize using the specific formulas If the coordination values are default then re-initialize using the specific formulas
to move the dialog at the bottom of the screen. to move the dialog at the bottom of the screen.
*/ */
@ -191,7 +191,7 @@ int OSK_DlgInitDialog(HWND hDlg)
Globals.PosY = info.rcMonitor.bottom - (rcWindow.bottom - rcWindow.top); Globals.PosY = info.rcMonitor.bottom - (rcWindow.bottom - rcWindow.top);
} }
/* /*
Calculate the intersection of two rectangle sources (dialog and work desktop area). Calculate the intersection of two rectangle sources (dialog and work desktop area).
If such sources do not intersect, then the dialog is deemed as "off screen". If such sources do not intersect, then the dialog is deemed as "off screen".
*/ */
@ -439,6 +439,7 @@ LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw)
{ {
HTHEME hTheme; HTHEME hTheme;
HWND hDlgButtonCtrl; HWND hDlgButtonCtrl;
LRESULT Ret;
INT iState = PBS_NORMAL; INT iState = PBS_NORMAL;
/* Retrieve the theme handle for the button controls */ /* Retrieve the theme handle for the button controls */
@ -451,34 +452,59 @@ LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw)
*/ */
if (hTheme) if (hTheme)
{ {
/* /* Obtain CDDS drawing stages */
The button could be either in normal state or pushed. switch (pNmDraw->dwDrawStage)
Retrieve its state and save to a variable.
*/
if (pNmDraw->uItemState & CDIS_DEFAULT)
{ {
iState = PBS_DEFAULTED; case CDDS_PREPAINT:
} {
else if (pNmDraw->uItemState & CDIS_SELECTED) /*
{ The button could be either in normal state or pushed.
iState = PBS_PRESSED; Retrieve its state and save to a variable.
} */
else if (pNmDraw->uItemState & CDIS_HOT) if (pNmDraw->uItemState & CDIS_DEFAULT)
{ {
iState = PBS_HOT; iState = PBS_DEFAULTED;
} }
else if (pNmDraw->uItemState & CDIS_SELECTED)
{
iState = PBS_PRESSED;
}
else if (pNmDraw->uItemState & CDIS_HOT)
{
iState = PBS_HOT;
}
if (IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) if (IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState))
{ {
/* Draw the application if the theme is transparent */ /* Draw the application if the theme is transparent */
DrawThemeParentBackground(hDlg, pNmDraw->hdc, &pNmDraw->rc); DrawThemeParentBackground(hDlgButtonCtrl, pNmDraw->hdc, &pNmDraw->rc);
} }
/* Draw it */ /* Draw it */
DrawThemeBackground(hTheme, pNmDraw->hdc, BP_PUSHBUTTON, iState, &pNmDraw->rc, NULL); DrawThemeBackground(hTheme, pNmDraw->hdc, BP_PUSHBUTTON, iState, &pNmDraw->rc, NULL);
Ret = CDRF_SKIPDEFAULT;
break;
}
case CDDS_PREERASE:
{
Ret = CDRF_DODEFAULT;
break;
}
default:
Ret = CDRF_SKIPDEFAULT;
break;
}
}
else
{
/* hTheme is NULL so bail right away */
Ret = CDRF_DODEFAULT;
} }
return CDRF_SKIPDEFAULT; return Ret;
} }
/*********************************************************************** /***********************************************************************
@ -543,7 +569,7 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
if (!Globals.bIsEnhancedKeyboard) if (!Globals.bIsEnhancedKeyboard)
{ {
/* /*
The user attempted to switch to enhanced keyboard dialog type. The user attempted to switch to enhanced keyboard dialog type.
Set the member value as TRUE, destroy the dialog and save the data configuration into the registry. Set the member value as TRUE, destroy the dialog and save the data configuration into the registry.
*/ */