mirror of
https://github.com/reactos/reactos.git
synced 2024-10-01 23:14:53 +00:00
[0.4.13][WIN32SS] Fix Mask for Draw Frame States CORE-8808
Fixes drawing of caption bar buttons (min/max/close in Mozilla Firefox titlebar when its menubar is disabled).
See CORE-8808.
The fix is a partial port of 0.4.14-dev-1314-g acf135d16d
I left out all changes to the logging and took only the essence of this patch.
This commit is contained in:
parent
04c7635c9e
commit
3b8bfa0bd2
|
@ -757,7 +757,7 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL
|
||||||
/* Ported from WINE20020904 */
|
/* Ported from WINE20020904 */
|
||||||
BOOL FASTCALL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
|
BOOL FASTCALL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
|
||||||
{
|
{
|
||||||
switch(uState & 0xff)
|
switch(uState & 0x1f)
|
||||||
{
|
{
|
||||||
case DFCS_BUTTONPUSH:
|
case DFCS_BUTTONPUSH:
|
||||||
return UITOOLS95_DFC_ButtonPush(hdc, rc, uState);
|
return UITOOLS95_DFC_ButtonPush(hdc, rc, uState);
|
||||||
|
@ -787,7 +787,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
|
||||||
RECT myr;
|
RECT myr;
|
||||||
INT bkmode;
|
INT bkmode;
|
||||||
WCHAR Symbol;
|
WCHAR Symbol;
|
||||||
switch(uFlags & 0xff)
|
switch(uFlags & 0xf)
|
||||||
{
|
{
|
||||||
case DFCS_CAPTIONCLOSE:
|
case DFCS_CAPTIONCLOSE:
|
||||||
Symbol = 'r';
|
Symbol = 'r';
|
||||||
|
@ -854,7 +854,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags)
|
||||||
RECT myr;
|
RECT myr;
|
||||||
INT bkmode;
|
INT bkmode;
|
||||||
WCHAR Symbol;
|
WCHAR Symbol;
|
||||||
switch(uFlags & 0xff)
|
switch(uFlags & 0x1f)
|
||||||
{
|
{
|
||||||
case DFCS_SCROLLCOMBOBOX:
|
case DFCS_SCROLLCOMBOBOX:
|
||||||
case DFCS_SCROLLDOWN:
|
case DFCS_SCROLLDOWN:
|
||||||
|
@ -957,7 +957,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
|
||||||
RECT myr;
|
RECT myr;
|
||||||
INT cxy;
|
INT cxy;
|
||||||
cxy = UITOOLS_MakeSquareRect(r, &myr);
|
cxy = UITOOLS_MakeSquareRect(r, &myr);
|
||||||
switch(uFlags & 0xff)
|
switch(uFlags & 0x1f)
|
||||||
{
|
{
|
||||||
case DFCS_MENUARROWUP:
|
case DFCS_MENUARROWUP:
|
||||||
Symbol = '5';
|
Symbol = '5';
|
||||||
|
@ -1000,8 +1000,8 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
|
||||||
/* save font */
|
/* save font */
|
||||||
hOldFont = NtGdiSelectFont(dc, hFont);
|
hOldFont = NtGdiSelectFont(dc, hFont);
|
||||||
|
|
||||||
if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
|
if ((uFlags & 0x1f) == DFCS_MENUARROWUP ||
|
||||||
(uFlags & 0xff) == DFCS_MENUARROWDOWN )
|
(uFlags & 0x1f) == DFCS_MENUARROWDOWN )
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
if (uFlags & DFCS_INACTIVE)
|
if (uFlags & DFCS_INACTIVE)
|
||||||
|
|
|
@ -777,7 +777,7 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R
|
||||||
/* Ported from WINE20020904 */
|
/* Ported from WINE20020904 */
|
||||||
static BOOL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
|
static BOOL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
|
||||||
{
|
{
|
||||||
switch(uState & 0xff)
|
switch(uState & 0x1f)
|
||||||
{
|
{
|
||||||
case DFCS_BUTTONPUSH:
|
case DFCS_BUTTONPUSH:
|
||||||
return UITOOLS95_DFC_ButtonPush(hdc, rc, uState);
|
return UITOOLS95_DFC_ButtonPush(hdc, rc, uState);
|
||||||
|
@ -808,7 +808,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
|
||||||
RECT myr;
|
RECT myr;
|
||||||
INT bkmode;
|
INT bkmode;
|
||||||
TCHAR Symbol;
|
TCHAR Symbol;
|
||||||
switch(uFlags & 0xff)
|
switch(uFlags & 0xf)
|
||||||
{
|
{
|
||||||
case DFCS_CAPTIONCLOSE:
|
case DFCS_CAPTIONCLOSE:
|
||||||
Symbol = 'r';
|
Symbol = 'r';
|
||||||
|
@ -875,7 +875,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags)
|
||||||
RECT myr;
|
RECT myr;
|
||||||
INT bkmode;
|
INT bkmode;
|
||||||
TCHAR Symbol;
|
TCHAR Symbol;
|
||||||
switch(uFlags & 0xff)
|
switch(uFlags & 0x1f)
|
||||||
{
|
{
|
||||||
case DFCS_SCROLLCOMBOBOX:
|
case DFCS_SCROLLCOMBOBOX:
|
||||||
case DFCS_SCROLLDOWN:
|
case DFCS_SCROLLDOWN:
|
||||||
|
@ -979,7 +979,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
|
||||||
RECT myr;
|
RECT myr;
|
||||||
INT cxy;
|
INT cxy;
|
||||||
cxy = UITOOLS_MakeSquareRect(r, &myr);
|
cxy = UITOOLS_MakeSquareRect(r, &myr);
|
||||||
switch(uFlags & 0xff)
|
switch(uFlags & 0x1f)
|
||||||
{
|
{
|
||||||
case DFCS_MENUARROWUP:
|
case DFCS_MENUARROWUP:
|
||||||
Symbol = '5';
|
Symbol = '5';
|
||||||
|
@ -1020,8 +1020,8 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
|
||||||
/* save font */
|
/* save font */
|
||||||
hOldFont = SelectObject(dc, hFont);
|
hOldFont = SelectObject(dc, hFont);
|
||||||
|
|
||||||
if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
|
if ((uFlags & 0x1f) == DFCS_MENUARROWUP ||
|
||||||
(uFlags & 0xff) == DFCS_MENUARROWDOWN )
|
(uFlags & 0x1f) == DFCS_MENUARROWDOWN )
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
if (uFlags & DFCS_INACTIVE)
|
if (uFlags & DFCS_INACTIVE)
|
||||||
|
|
Loading…
Reference in a new issue