|
|
|
@ -786,6 +786,13 @@ void QPainter::updatePen()
|
|
|
|
|
dashes[5] = dot;
|
|
|
|
|
dash_len = 6;
|
|
|
|
|
allow_zero_lw = FALSE;
|
|
|
|
|
break;
|
|
|
|
|
case FineDotLine:
|
|
|
|
|
dot = 1;
|
|
|
|
|
dashes[0] = dot;
|
|
|
|
|
dashes[1] = dot;
|
|
|
|
|
dash_len = 2;
|
|
|
|
|
allow_zero_lw = FALSE;
|
|
|
|
|
}
|
|
|
|
|
Q_ASSERT( dash_len <= (int) sizeof(dashes) );
|
|
|
|
|
|
|
|
|
@ -1836,21 +1843,21 @@ void QPainter::drawWinFocusRect( int x, int y, int w, int h,
|
|
|
|
|
|
|
|
|
|
if ( xorPaint ) {
|
|
|
|
|
if ( QColor::numBitPlanes() <= 8 )
|
|
|
|
|
setPen( color1 );
|
|
|
|
|
setPen( QPen(color1, 0, Qt::FineDotLine) );
|
|
|
|
|
else
|
|
|
|
|
setPen( white );
|
|
|
|
|
setPen( QPen(white, 0, Qt::FineDotLine) );
|
|
|
|
|
setRasterOp( XorROP );
|
|
|
|
|
} else {
|
|
|
|
|
if ( qGray( bgColor.rgb() ) < 128 )
|
|
|
|
|
setPen( white );
|
|
|
|
|
setPen( QPen(white, 0, Qt::FineDotLine) );
|
|
|
|
|
else
|
|
|
|
|
setPen( black );
|
|
|
|
|
setPen( QPen(black, 0, Qt::FineDotLine) );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( testf(ExtDev|VxF|WxF) ) {
|
|
|
|
|
if ( testf(ExtDev) ) {
|
|
|
|
|
QPDevCmdParam param[1];
|
|
|
|
|
QRect r( x, y, w, h );
|
|
|
|
|
QRect r( x, y, w-1, h-1 );
|
|
|
|
|
param[0].rect = &r;
|
|
|
|
|
if ( !pdev->cmd( QPaintDevice::PdcDrawRect, this, param ) || !hd) {
|
|
|
|
|
setRasterOp( old_rop );
|
|
|
|
|