wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix testplugin painting issues from bug 596451 part J - when doing non-solid painting, paint to x/y, not 0/0.

Browse Source
This commit is contained in:
Benjamin Smedberg 2010-10-28 09:17:35 -04:00
parent f720cf82c8
commit f8d5bcfbda
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/plugin/test/testplugin/nptest_windows.cpp
View File

@ -112,11 +112,11 @@ static void
drawToDC(InstanceData* instanceData, HDC dc, drawToDC(InstanceData* instanceData, HDC dc,
int x, int y, int width, int height) int x, int y, int width, int height)
{ {
RECT fill = { 0, 0, width, height };
switch (instanceData->scriptableObject->drawMode) { switch (instanceData->scriptableObject->drawMode) {
case DM_DEFAULT: case DM_DEFAULT:
{ {
const RECT fill = { x, y, width, height };
int oldBkMode = ::SetBkMode(dc, TRANSPARENT); int oldBkMode = ::SetBkMode(dc, TRANSPARENT);
HBRUSH brush = ::CreateSolidBrush(RGB(0, 0, 0)); HBRUSH brush = ::CreateSolidBrush(RGB(0, 0, 0));
if (brush) { if (brush) {
@ -126,7 +126,7 @@ drawToDC(InstanceData* instanceData, HDC dc,
if (width > 6 && height > 6) { if (width > 6 && height > 6) {
brush = ::CreateSolidBrush(RGB(192, 192, 192)); brush = ::CreateSolidBrush(RGB(192, 192, 192));
if (brush) { if (brush) {
RECT inset = { 3, 3, width - 3, height - 3 }; RECT inset = { x + 3, y + 3, x + width - 3, y + height - 3 };
::FillRect(dc, &inset, brush); ::FillRect(dc, &inset, brush);
::DeleteObject(brush); ::DeleteObject(brush);
} }
@ -141,7 +141,7 @@ drawToDC(InstanceData* instanceData, HDC dc,
DEFAULT_PITCH, "Arial"); DEFAULT_PITCH, "Arial");
if (font) { if (font) {
HFONT oldFont = (HFONT)::SelectObject(dc, font); HFONT oldFont = (HFONT)::SelectObject(dc, font);
RECT inset = { 5, 5, width - 5, height - 5 }; RECT inset = { x + 5, y + 5, x + width - 5, y + height - 5 };
::DrawTextA(dc, uaString, -1, &inset, ::DrawTextA(dc, uaString, -1, &inset,
DT_LEFT | DT_TOP | DT_NOPREFIX | DT_WORDBREAK); DT_LEFT | DT_TOP | DT_NOPREFIX | DT_WORDBREAK);
::SelectObject(dc, oldFont); ::SelectObject(dc, oldFont);