yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.3'

Browse source
This commit is contained in:
Martin Gräßlin 2015-05-21 13:33:53 +02:00
commit 0258748eb5
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/backgroundcontrast/contrast.cpp
View file

@ -230,6 +230,8 @@ void ContrastEffect::uploadRegion(QVector2D *&map, const QRegion &region)
void ContrastEffect::uploadGeometry(GLVertexBuffer *vbo, const QRegion &region) void ContrastEffect::uploadGeometry(GLVertexBuffer *vbo, const QRegion &region)
{ {
const int vertexCount = region.rectCount() * 6; const int vertexCount = region.rectCount() * 6;
if (!vertexCount)
return;
QVector2D *map = (QVector2D *) vbo->map(vertexCount * sizeof(QVector2D)); QVector2D *map = (QVector2D *) vbo->map(vertexCount * sizeof(QVector2D));
uploadRegion(map, region); uploadRegion(map, region);

2
effects/blur/blur.cpp
View file

@ -236,6 +236,8 @@ void BlurEffect::uploadRegion(QVector2D *&map, const QRegion &region)
void BlurEffect::uploadGeometry(GLVertexBuffer *vbo, const QRegion &horizontal, const QRegion &vertical) void BlurEffect::uploadGeometry(GLVertexBuffer *vbo, const QRegion &horizontal, const QRegion &vertical)
{ {
const int vertexCount = (horizontal.rectCount() + vertical.rectCount()) * 6; const int vertexCount = (horizontal.rectCount() + vertical.rectCount()) * 6;
if (!vertexCount)
return;
QVector2D *map = (QVector2D *) vbo->map(vertexCount * sizeof(QVector2D)); QVector2D *map = (QVector2D *) vbo->map(vertexCount * sizeof(QVector2D));
uploadRegion(map, horizontal); uploadRegion(map, horizontal);

1
effects/presentwindows/presentwindows.cpp
View file

@ -135,6 +135,7 @@ void PresentWindowsEffect::reconfigure(ReconfigureFlags)
if (m_doNotCloseWindows) { if (m_doNotCloseWindows) {
delete m_closeView; delete m_closeView;
m_closeView = nullptr; m_closeView = nullptr;
m_closeWindow = nullptr;
} }
m_ignoreMinimized = PresentWindowsConfig::ignoreMinimized(); m_ignoreMinimized = PresentWindowsConfig::ignoreMinimized();
m_accuracy = PresentWindowsConfig::accuracy() * 20; m_accuracy = PresentWindowsConfig::accuracy() * 20;