refactor window geometry checking

src/plugins/screenshot/screenshot.cpp

@@ -228,17 +228,21 @@ void ScreenShotEffect::takeScreenShot(ScreenShotWindowData *screenshot)
     WindowPaintData d;
     QRectF geometry = window->expandedGeometry();
     qreal devicePixelRatio = 1;
-    if (window->hasDecoration() && !(screenshot->flags & ScreenShotIncludeDecoration)) {
+    bool includeDecorations = (screenshot->flags & ScreenShotIncludeDecoration);
+    bool includeShadow = (screenshot->flags & ScreenShotIncludeShadow);
+
+    if (window->hasDecoration() && !includeDecorations) {
         geometry = window->clientGeometry();
-    }
+    } else if (window->hasDecoration() && !includeShadow) {
-    if (window->hasDecoration() && !(screenshot->flags & ScreenShotIncludeShadow)) {
         geometry = window->frameGeometry();
     }
+
     if (screenshot->flags & ScreenShotNativeResolution) {
         if (const EffectScreen *screen = window->screen()) {
             devicePixelRatio = screen->devicePixelRatio();
         }
     }
+
     bool validTarget = true;
     std::unique_ptr<GLTexture> offscreenTexture;
     std::unique_ptr<GLFramebuffer> target;