ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Win9x look & feel on buttons and a fix for ownerdrawn buttons 

(background set to COLOR_BTNFACE).
This commit is contained in:
Dennis Björklund 1999-07-15 16:07:19 +00:00 committed by Alexandre Julliard
parent d65b73bb54
commit 767b099fe8
1 changed files with 74 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
controls/button.c
View File

@ -312,7 +312,7 @@ LRESULT WINAPI ButtonWndProc( HWND hWnd, UINT uMsg,
static void PB_Paint( WND *wndPtr, HDC hDC, WORD action ) static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
{ {
RECT rc; RECT rc, focus_rect;
HPEN hOldPen; HPEN hOldPen;
HBRUSH hOldBrush; HBRUSH hOldBrush;
BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra; BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
@ -327,15 +327,17 @@ static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
hOldPen = (HPEN)SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME)); hOldPen = (HPEN)SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE));
SetBkMode(hDC, TRANSPARENT); SetBkMode(hDC, TRANSPARENT);
Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
if ( TWEAK_WineLook == WIN31_LOOK) if ( TWEAK_WineLook == WIN31_LOOK)
{ {
Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
SetPixel( hDC, rc.left, rc.top, GetSysColor(COLOR_WINDOW) ); SetPixel( hDC, rc.left, rc.top, GetSysColor(COLOR_WINDOW) );
SetPixel( hDC, rc.left, rc.bottom-1, GetSysColor(COLOR_WINDOW) ); SetPixel( hDC, rc.left, rc.bottom-1, GetSysColor(COLOR_WINDOW) );
SetPixel( hDC, rc.right-1, rc.top, GetSysColor(COLOR_WINDOW) ); SetPixel( hDC, rc.right-1, rc.top, GetSysColor(COLOR_WINDOW) );
SetPixel( hDC, rc.right-1, rc.bottom-1, GetSysColor(COLOR_WINDOW)); SetPixel( hDC, rc.right-1, rc.bottom-1, GetSysColor(COLOR_WINDOW));
}
InflateRect( &rc, -1, -1 ); InflateRect( &rc, -1, -1 );
}
if ((wndPtr->dwStyle & 0x000f) == BS_DEFPUSHBUTTON) if ((wndPtr->dwStyle & 0x000f) == BS_DEFPUSHBUTTON)
{ {
@ -343,6 +345,8 @@ static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
InflateRect( &rc, -1, -1 ); InflateRect( &rc, -1, -1 );
} }
if (TWEAK_WineLook == WIN31_LOOK)
{
if (infoPtr->state & BUTTON_HIGHLIGHTED) if (infoPtr->state & BUTTON_HIGHLIGHTED)
{ {
/* draw button shadow: */ /* draw button shadow: */
@ -361,9 +365,39 @@ static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
rc.right--, rc.bottom--; rc.right--, rc.bottom--;
} }
}
else
{
UINT uState = DFCS_BUTTONPUSH;
/* draw button label, if any: */ if (infoPtr->state & BUTTON_HIGHLIGHTED)
if (wndPtr->text && wndPtr->text[0]) {
if ( (wndPtr->dwStyle & 0x000f) == BS_DEFPUSHBUTTON )
uState |= DFCS_FLAT;
else
uState |= DFCS_PUSHED;
}
DrawFrameControl( hDC, &rc, DFC_BUTTON, uState );
InflateRect( &rc, -2, -2 );
focus_rect = rc;
if (infoPtr->state & BUTTON_HIGHLIGHTED)
{
rc.left += 2; /* To position the text down and right */
rc.top += 2;
}
}
/* draw button label, if any:
*
* In win9x we don't show text if there is a bitmap or icon.
* I don't know about win31 so I leave it as it was for win31.
* Dennis Björklund 12 Jul, 99
*/
if ( wndPtr->text && wndPtr->text[0]
&& (TWEAK_WineLook == WIN31_LOOK || !(wndPtr->dwStyle & (BS_ICON|BS_BITMAP))) )
{ {
LOGBRUSH lb; LOGBRUSH lb;
GetObjectA( GetSysColorBrush(COLOR_BTNFACE), sizeof(lb), &lb ); GetObjectA( GetSysColorBrush(COLOR_BTNFACE), sizeof(lb), &lb );
@ -379,8 +413,11 @@ static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
GetSysColor(COLOR_BTNTEXT) ); GetSysColor(COLOR_BTNTEXT) );
DrawTextA( hDC, wndPtr->text, -1, &rc, DrawTextA( hDC, wndPtr->text, -1, &rc,
DT_SINGLELINE | DT_CENTER | DT_VCENTER ); DT_SINGLELINE | DT_CENTER | DT_VCENTER );
/* do we have the focus? */ /* do we have the focus?
if (infoPtr->state & BUTTON_HASFOCUS) * Win9x draws focus last with a size prop. to the button
*/
if (TWEAK_WineLook == WIN31_LOOK
&& infoPtr->state & BUTTON_HASFOCUS)
{ {
RECT r = { 0, 0, 0, 0 }; RECT r = { 0, 0, 0, 0 };
INT xdelta, ydelta; INT xdelta, ydelta;
@ -438,6 +475,14 @@ static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
DeleteDC (hdcMem); DeleteDC (hdcMem);
} }
if (TWEAK_WineLook != WIN31_LOOK
&& infoPtr->state & BUTTON_HASFOCUS)
{
InflateRect( &focus_rect, -1, -1 );
DrawFocusRect( hDC, &focus_rect );
}
SelectObject( hDC, hOldPen ); SelectObject( hDC, hOldPen );
SelectObject( hDC, hOldBrush ); SelectObject( hDC, hOldBrush );
} }
@ -711,6 +756,10 @@ static void OB_Paint( WND *wndPtr, HDC hDC, WORD action )
dis.hDC = hDC; dis.hDC = hDC;
dis.itemData = 0; dis.itemData = 0;
GetClientRect( wndPtr->hwndSelf, &dis.rcItem ); GetClientRect( wndPtr->hwndSelf, &dis.rcItem );
SetBkColor( hDC, GetSysColor( COLOR_BTNFACE ) );
FillRect( hDC, &dis.rcItem, GetSysColorBrush( COLOR_BTNFACE ) );
SendMessageA( GetParent(wndPtr->hwndSelf), WM_DRAWITEM, SendMessageA( GetParent(wndPtr->hwndSelf), WM_DRAWITEM,
wndPtr->wIDmenu, (LPARAM)&dis ); wndPtr->wIDmenu, (LPARAM)&dis );
} }