Updated the look of dots and dashes to match the Win32 look.

Issue a FIXME about PS_USERSTYLE.
This commit is contained in:
Francois Gouget 2000-12-24 20:16:25 +00:00 committed by Alexandre Julliard
parent b6ac770f04
commit 345acc90fd
2 changed files with 9 additions and 7 deletions

View File

@ -11,11 +11,13 @@
#include "x11drv.h" #include "x11drv.h"
#include "debugtools.h" #include "debugtools.h"
static const char PEN_dash[] = { 5,3 }; /* ----- ----- ----- */ DEFAULT_DEBUG_CHANNEL(x11drv);
static const char PEN_dot[] = { 1,1 }; /* -- -- -- -- -- -- */
static const char PEN_dashdot[] = { 4,3,2,3 }; /* ---- -- ---- -- */ static const char PEN_dash[] = { 16,8 };
static const char PEN_dashdotdot[] = { 4,2,2,2,2,2 }; /* ---- -- -- ---- */ static const char PEN_dot[] = { 4,4 };
static const char PEN_alternate[] = { 1,1 }; /* FIXME */ static const char PEN_dashdot[] = { 12,8,4,8 };
static const char PEN_dashdotdot[] = { 12,4,4,4,4,4 };
static const char PEN_alternate[] = { 1,1 };
/*********************************************************************** /***********************************************************************
* PEN_SelectObject * PEN_SelectObject
@ -59,7 +61,7 @@ HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
physDev->pen.dash_len = sizeof(PEN_alternate)/sizeof(*PEN_alternate); physDev->pen.dash_len = sizeof(PEN_alternate)/sizeof(*PEN_alternate);
break; break;
case PS_USERSTYLE: case PS_USERSTYLE:
/* FIXME */ FIXME("PS_USERSTYLE is not supported\n");
break; break;
} }

View File

@ -1355,7 +1355,7 @@ BOOL WINAPI DrawFocusRect( HDC hdc, const RECT* rc )
INT oldDrawMode, oldBkMode; INT oldDrawMode, oldBkMode;
hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH)); hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH));
hNewPen = CreatePen(PS_DOT, 1, GetSysColor(COLOR_WINDOWTEXT)); hNewPen = CreatePen(PS_ALTERNATE, 1, GetSysColor(COLOR_WINDOWTEXT));
hOldPen = SelectObject(hdc, hNewPen); hOldPen = SelectObject(hdc, hNewPen);
oldDrawMode = SetROP2(hdc, R2_XORPEN); oldDrawMode = SetROP2(hdc, R2_XORPEN);
oldBkMode = SetBkMode(hdc, TRANSPARENT); oldBkMode = SetBkMode(hdc, TRANSPARENT);