- Patch by Sebastian Gasiorek : Fix incorrect placement of the text in the Tab buttons. Implement TA_UPDATECP. See CORE-1578 and CORE-11415.

svn path=/trunk/; revision=72521
This commit is contained in:
James Tabor 2016-08-31 16:20:57 +00:00
parent 303ece2421
commit 8496d0aa2e

View file

@ -3408,9 +3408,15 @@ GreExtTextOutW(
IntLPtoDP(dc, (POINT *)lprc, 2); IntLPtoDP(dc, (POINT *)lprc, 2);
} }
if(pdcattr->lTextAlign & TA_UPDATECP)
{
Start.x = pdcattr->ptlCurrent.x;
Start.y = pdcattr->ptlCurrent.y;
} else {
Start.x = XStart; Start.x = XStart;
Start.y = YStart; Start.y = YStart;
IntLPtoDP(dc, &Start, 1); IntLPtoDP(dc, &Start, 1);
}
RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6;
YStart = Start.y + dc->ptlDCOrig.y; YStart = Start.y + dc->ptlDCOrig.y;
@ -3842,6 +3848,11 @@ GreExtTextOutW(
String++; String++;
} }
if (pdcattr->lTextAlign & TA_UPDATECP) {
pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x;
}
IntUnLockFreeType; IntUnLockFreeType;
DC_vFinishBlit(dc, NULL) ; DC_vFinishBlit(dc, NULL) ;