Skip to content

Commit 97ab52a

Browse files
committed
[0.4.11] Revert "[COMCTL32] button: Don't erase the area of the checkbox or the text."
This reverts last commit 0.4.11-RC-28-g fc9e7ba. Okay, I changed my mind: fc9e7ba fixed the flickering for the text, but would leave the flickering existant for the selection rectangle and also for the checkmarks/radio-button-circle. On its own it would only half-fix CORE-13278 therefore. More problematic is that it would introduce a new regression CORE-15595. I revert it because I do not want to transform 1 regression into 1,5regressions. Test-results are easier to maintain with that conservative approach. Seems we have to endure the flickering for another release :-(
1 parent fc9e7ba commit 97ab52a

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

dll/win32/comctl32/button.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,9 +1550,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action )
15501550

15511551
/* Since WM_ERASEBKGND does nothing, first prepare background */
15521552
if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush );
1553-
#ifndef __REACTOS__
15541553
if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush );
1555-
#endif
15561554

15571555
/* Draw label */
15581556
client = rtext;
@@ -1618,15 +1616,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action )
16181616
if (action == ODA_DRAWENTIRE)
16191617
BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &rtext);
16201618

1621-
#ifdef __REACTOS__
1622-
if (action == ODA_DRAWENTIRE)
1623-
{
1624-
ExcludeClipRect(hDC, rbox.left, rbox.top, rbox.right, rbox.bottom);
1625-
ExcludeClipRect(hDC, rtext.left, rtext.top + 1, rtext.right, rtext.bottom - 1);
1626-
FillRect( hDC, &client, hBrush );
1627-
}
1628-
#endif
1629-
16301619
/* ... and focus */
16311620
if (action == ODA_FOCUS || (state & BST_FOCUS))
16321621
{

0 commit comments

Comments
 (0)