Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.13][WIN32SS] Repaint the whole window frame on some style bits set (#3199) CORE-16827

Browse source 
This fixes the ReactOS Calculator buttons disappearing in CORE-16827

It once regressed by 0.4.13-dev-221-g 2161dd85dc
which did aim to fix CORE-15934.
Noteworthy that releases/0.4.12 was never affected although I fixed CORE-15934
there as well, but *not* with the fix that went into master later!

fix picked from commit 0.4.15-dev-1197-g 8081ba9332

For the record: We know that what we do commit here for the time being is a workaround just,
and we will most likely replace it later with a proper patch from CORE18072.
But only after that one settled down for a while. Until then, this thing here will mitigate.
This commit is contained in:
Joachim Henze 2022-03-11 03:20:06 +01:00
parent 99d43722de
commit 786a4bb36d
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
win32ss/user/ntuser/winpos.c
View file

@ -2113,13 +2113,25 @@ co_WinPosSetWindowPos(
if ( !(pwnd->style & WS_CHILD) )
{
HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
PREGION DcRgnObj = REGION_LockRgn(DcRgn);
TRACE("SWP_FRAMECHANGED win %p hRgn %p\n",pwnd, DcRgn);
IntGdiCombineRgn(DcRgnObj, VisBefore, NULL, RGN_COPY);
REGION_UnlockRgn(DcRgnObj);
ForceNCPaintErase(pwnd, DcRgn, DcRgnObj);
GreDeleteObject(DcRgn);
/*
* Check if we have these specific windows style bits set/reset.
* FIXME: There may be other combinations of styles that need this handling as well.
* This fixes the ReactOS Calculator buttons disappearing in CORE-16827.
*/
if ((Window->style & WS_CLIPSIBLINGS) && !(Window->style & (WS_POPUP | WS_CLIPCHILDREN | WS_SIZEBOX)))
{
IntSendNCPaint(pwnd, HRGN_WINDOW); // Paint the whole frame.
}
else // Use region handling
{
HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
PREGION DcRgnObj = REGION_LockRgn(DcRgn);
TRACE("SWP_FRAMECHANGED win %p hRgn %p\n",pwnd, DcRgn);
IntGdiCombineRgn(DcRgnObj, VisBefore, NULL, RGN_COPY);
REGION_UnlockRgn(DcRgnObj);
ForceNCPaintErase(pwnd, DcRgn, DcRgnObj);
GreDeleteObject(DcRgn);
}
}
}
}