blur/fake-blur: wait 5 seconds before fetching desktop wallpaper to e…

…nsure plasmashell has started

src/blur.cpp

@@ -145,6 +145,14 @@ BlurEffect::BlurEffect()
         slotWindowAdded(window);
     }
 
+    fakeBlurDesktopWallpaperTimer.setSingleShot(true);
+    fakeBlurDesktopWallpaperTimer.callOnTimeout([this]() {
+        isDesktopWallpaperAvailable = true;
+        if (m_settings.fakeBlur.enable && m_settings.fakeBlur.imageSource == FakeBlurImageSource::DesktopWallpaper) {
+            effects->addRepaintFull();
+        }
+    });
+
     m_valid = true;
 }
 
@@ -615,6 +623,12 @@ void BlurEffect::drawWindow(const RenderTarget &renderTarget, const RenderViewpo
 
     // Draw the window over the blurred area
     effects->drawWindow(renderTarget, viewport, w, mask, region, data);
+
+    // Couldn't find a better way to check if PlasmaShell has started. The desktop will still be black at this point,
+    // so we have to wait.
+    if (w->isDesktop() && !isDesktopWallpaperAvailable && !fakeBlurDesktopWallpaperTimer.isActive()) {
+        fakeBlurDesktopWallpaperTimer.start(5000);
+    }
 }
 
 GLTexture *BlurEffect::ensureFakeBlurTexture(const Output *output)
@@ -625,14 +639,17 @@ GLTexture *BlurEffect::ensureFakeBlurTexture(const Output *output)
 
     QImage image;
     if (m_settings.fakeBlur.imageSource == FakeBlurImageSource::DesktopWallpaper) {
+        // It's much easier to just take a screenshot of the desktop than to read the wallpaper package path from
+        // a configuration file, find the image with the right resolution and scale, center or tile it.
+
         EffectWindow *desktop;
         for (EffectWindow *w : effects->stackingOrder()) {
             if (w && w->isDesktop() && (!output || w->window()->output() == output)) {
                 desktop = w;
                 break;
             }
         }
-        if (!desktop) {
+        if (!desktop || !isDesktopWallpaperAvailable) {
             return nullptr;
         }
 

src/blur.h

@@ -174,6 +174,9 @@ public Q_SLOTS:
 
     QList<BlurValuesStruct> blurStrengthValues;
 
+    QTimer fakeBlurDesktopWallpaperTimer;
+    bool isDesktopWallpaperAvailable = false;
+
     QHash<const Output*, GLTexture*> m_fakeBlurTextures;
 
     // Windows to blur even when transformed.