Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

User32 combo.c:

Browse source 
- Patch by Dmitry Timoshkov
  - do not force repainting on WM_WINDOWPOSCHANGED in combobox, it
    breaks Z-order based painting.
  - do nothing in the combobox WM_ERASEBKGND handler do all painting in
    WM_PAINT like Windows does.


svn path=/trunk/; revision=23905
This commit is contained in:
James Tabor 2006-09-04 03:03:14 +00:00
parent 09a8680165
commit 76b17ae494
2 changed files with 13 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
reactos/dll/win32/user32/controls/combo.c
View file

@ -909,34 +909,6 @@ static HBRUSH COMBO_PrepareColors(
return hBkgBrush; return hBkgBrush;
} }
/***********************************************************************
* COMBO_EraseBackground
*/
static LRESULT COMBO_EraseBackground(
HWND hwnd,
LPHEADCOMBO lphc,
HDC hParamDC)
{
HBRUSH hBkgBrush;
HDC hDC;
if(lphc->wState & CBF_EDIT)
return TRUE;
hDC = (hParamDC) ? hParamDC
: GetDC(hwnd);
/*
* Retrieve the background brush
*/
hBkgBrush = COMBO_PrepareColors(lphc, hDC);
FillRect(hDC, &lphc->textRect, hBkgBrush);
if (!hParamDC)
ReleaseDC(hwnd, hDC);
return TRUE;
}
/*********************************************************************** /***********************************************************************
* COMBO_Paint * COMBO_Paint
@ -962,6 +934,8 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC)
hBkgBrush = COMBO_PrepareColors(lphc, hDC); hBkgBrush = COMBO_PrepareColors(lphc, hDC);
hPrevBrush = SelectObject( hDC, hBkgBrush ); hPrevBrush = SelectObject( hDC, hBkgBrush );
if (!(lphc->wState & CBF_EDIT))
FillRect(hDC, &lphc->textRect, hBkgBrush);
/* /*
* In non 3.1 look, there is a sunken border on the combobox * In non 3.1 look, there is a sunken border on the combobox
@ -1603,7 +1577,7 @@ static void CBResetPos(
/*********************************************************************** /***********************************************************************
* COMBO_Size * COMBO_Size
*/ */
static void COMBO_Size( LPHEADCOMBO lphc ) static void COMBO_Size( LPHEADCOMBO lphc, BOOL bRedraw )
{ {
CBCalcPlacement(lphc->self, CBCalcPlacement(lphc->self,
lphc, lphc,
@ -1611,7 +1585,7 @@ static void COMBO_Size( LPHEADCOMBO lphc )
&lphc->buttonRect, &lphc->buttonRect,
&lphc->droppedRect); &lphc->droppedRect);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, bRedraw );
} }
@ -1904,15 +1878,15 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
} }
case WM_PRINTCLIENT: case WM_PRINTCLIENT:
if (lParam & PRF_ERASEBKGND)
COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
/* Fallthrough */ /* Fallthrough */
case WM_PAINT: case WM_PAINT:
/* wParam may contain a valid HDC! */ /* wParam may contain a valid HDC! */
return COMBO_Paint(lphc, (HDC)wParam); return COMBO_Paint(lphc, (HDC)wParam);
case WM_ERASEBKGND: case WM_ERASEBKGND:
return COMBO_EraseBackground(hwnd, lphc, (HDC)wParam); /* do all painting in WM_PAINT like Windows does */
return 1;
case WM_GETDLGCODE: case WM_GETDLGCODE:
{ {
LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS;
@ -1933,10 +1907,13 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
* get a WM_SIZE. Since we still want to update the Listbox, we have to * get a WM_SIZE. Since we still want to update the Listbox, we have to
* do it here. * do it here.
*/ */
/* we should not force repainting on WM_WINDOWPOSCHANGED, it breaks
* Z-order based painting.
*/
/* fall through */ /* fall through */
case WM_SIZE: case WM_SIZE:
if( lphc->hWndLBox && if( lphc->hWndLBox &&
!(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE );
return TRUE; return TRUE;
case WM_SETFONT: case WM_SETFONT:
COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

2
reactos/media/doc/README.WINE
View file

@ -119,7 +119,7 @@ msvcrt -
User32 - User32 -
reactos/dll/win32/user32/controls/button.c # Synced at 20060621 reactos/dll/win32/user32/controls/button.c # Synced at 20060621
reactos/dll/win32/user32/controls/combo.c # Synced at 20060617 reactos/dll/win32/user32/controls/combo.c # Synced at 20060904
reactos/dll/win32/user32/controls/edit.c # Synced at 20060710 reactos/dll/win32/user32/controls/edit.c # Synced at 20060710
reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617
reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616