Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

effectively revert 6586979321

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-12-08 05:46:33 +02:00
parent 5c869a3fd3
commit c5458bc2ce
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/painting/qbrush.cpp
View file

@ -61,9 +61,9 @@ QPixmap qt_pixmapForBrush(int brushStyle)
return QBitmap::fromData(QSize(8, 8), qt_patternForBrush(brushStyle), QImage::Format_MonoLSB);
}
Q_GUI_EXPORT QImage qt_diagCrossBrush()
Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle)
{
return QImage(qt_patternForBrush(Qt::DiagCrossPattern), 8, 8, 1, QImage::Format_MonoLSB);
return QImage(qt_patternForBrush(brushStyle), 8, 8, 1, QImage::Format_MonoLSB);
}

4
src/gui/painting/qpaintengine_raster.cpp
View file

@ -3197,7 +3197,7 @@ void QSpanData::init(QRasterBuffer *rb, const QRasterPaintEngine *pe)
clip = pe ? pe->d_func()->clip() : 0;
}
Q_GUI_EXPORT extern QImage qt_diagCrossBrush();
Q_GUI_EXPORT extern QImage qt_imageForBrush(int brushStyle);
void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode compositionMode)
{
@ -3286,7 +3286,7 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode
type = Texture;
if (!tempImage)
tempImage = new QImage();
*tempImage = rasterBuffer->colorizeBitmap(qt_diagCrossBrush(), brush.color());
*tempImage = rasterBuffer->colorizeBitmap(qt_imageForBrush(brushStyle), brush.color());
initTexture(tempImage, alpha, QTextureData::Tiled);
break;
case Qt::TexturePattern: