|
17 | 17 | #include "internalwindow.h" |
18 | 18 | #include "opengl/glutils.h" |
19 | 19 | #include "opengl/glplatform.h" |
20 | | -#include "scene/windowitem.h" |
21 | 20 | #include "utils.h" |
22 | 21 | #include "utils/xcbutils.h" |
23 | 22 | #include "wayland/blur.h" |
@@ -365,7 +364,7 @@ void BlurEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, std:: |
365 | 364 | const auto hadWindowBehind = blurWindow->hasWindowBehind(); |
366 | 365 | blurWindow->setHasWindowBehind(m_windowGeometriesSum.intersects(w->frameGeometry().toRect())); |
367 | 366 | if (hadWindowBehind != blurWindow->hasWindowBehind()) { |
368 | | - data.paint += w->windowItem()->boundingRect().toRect(); |
| 367 | + data.paint += w->expandedGeometry().toRect(); |
369 | 368 | } |
370 | 369 | } |
371 | 370 |
|
@@ -831,7 +830,7 @@ void BlurEffect::blur(BetterBlur::Window *w, BetterBlur::BlurRenderData &renderI |
831 | 830 |
|
832 | 831 | m_upsamplePass.shader->setUniform(m_upsamplePass.topCornerRadiusLocation, topCornerRadius); |
833 | 832 | m_upsamplePass.shader->setUniform(m_upsamplePass.bottomCornerRadiusLocation, bottomCornerRadius); |
834 | | - m_upsamplePass.shader->setUniform(m_upsamplePass.antialiasingLocation, w ? w->properties()->cornerAntialiasing() : 0.0); |
| 833 | + m_upsamplePass.shader->setUniform(m_upsamplePass.antialiasingLocation, static_cast<float>(w ? w->properties()->cornerAntialiasing() : 0.0)); |
835 | 834 | m_upsamplePass.shader->setUniform(m_upsamplePass.blurSizeLocation, QVector2D(backgroundRect.width(), backgroundRect.height())); |
836 | 835 | m_upsamplePass.shader->setUniform(m_upsamplePass.opacityLocation, static_cast<float>(opacity)); |
837 | 836 |
|
|
0 commit comments