Merge branch 'mart/DialogBackgroundHints'

REVIEW:119860

src/plasmaquick/dialog.cpp

@@ -61,7 +61,8 @@ public:
           hideOnWindowDeactivate(false),
           outputOnly(false),
           componentComplete(dialog->parent() == 0),
-          resizeOrigin(Undefined)
+          resizeOrigin(Undefined),
+          backgroundHints(Dialog::StandardBackground)
     {
     }
 
@@ -101,6 +102,7 @@ public:
     Plasma::Theme theme;
     bool componentComplete;
     ResizeOrigin resizeOrigin;
+    Dialog::BackgroundHints backgroundHints;
 
     //Attached Layout property of mainItem, if any
     QWeakPointer <QObject> mainItemLayout;
@@ -152,14 +154,25 @@ void DialogPrivate::syncBorders()
             updateMaximumHeight();
         }
     }
-
-    if (q->isVisible()) {
-        DialogShadows::self()->addWindow(q, frameSvgItem->enabledBorders());
-    }
 }
 
 void DialogPrivate::updateTheme()
 {
+    if (backgroundHints == Dialog::NoBackground) {
+        frameSvgItem->setImagePath(QString());
+        KWindowEffects::enableBlurBehind(q->winId(), false);
+        KWindowEffects::enableBackgroundContrast(q->winId(), false);
+        q->setMask(QRegion());
+        DialogShadows::self()->removeWindow(q);
+    } else {
+        if (type == Dialog::Tooltip) {
+            frameSvgItem->setImagePath("widgets/tooltip");
+        } else {
+            frameSvgItem->setImagePath("dialogs/background");
+        }
+
+        KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
+
         KWindowEffects::enableBackgroundContrast(q->winId(), theme.backgroundContrastEnabled(),
                 theme.backgroundContrast(),
                 theme.backgroundIntensity(),
@@ -171,6 +184,11 @@ void DialogPrivate::updateTheme()
         } else {
             q->setMask(frameSvgItem->frameSvg()->mask());
         }
+        if (q->isVisible()) {
+            DialogShadows::self()->addWindow(q, frameSvgItem->enabledBorders());
+        }
+    }
+    updateInputShape();
 }
 
 void DialogPrivate::updateVisibility(bool visible)
@@ -310,7 +328,12 @@ void DialogPrivate::updateInputShape()
     if (!q->isVisible()) {
         return;
     }
+
 #if HAVE_XCB_SHAPE
+    if (backgroundHints == Dialog::NoBackground) {
+        return;
+    }
+
     if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
         xcb_connection_t *c = QX11Info::connection();
         static bool s_shapeExtensionChecked = false;
@@ -348,7 +371,6 @@ void DialogPrivate::syncMainItemToSize()
 {
     syncBorders();
 
-    KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
     updateTheme();
 
     if (mainItem) {
@@ -395,7 +417,7 @@ void DialogPrivate::syncToMainItemSize()
     syncBorders();
     mainItem.data()->setX(frameSvgItem->margins()->left());
     mainItem.data()->setY(frameSvgItem->margins()->top());
-    KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
+
     updateTheme();
 }
 
@@ -460,7 +482,6 @@ Dialog::Dialog(QQuickItem *parent)
     property("data");
     //Create the FrameSvg background.
     d->frameSvgItem = new Plasma::FrameSvgItem(contentItem());
-    d->frameSvgItem->setImagePath("dialogs/background");
 
     connect(&d->theme, SIGNAL(themeChanged()),
             this, SLOT(updateTheme()));
@@ -761,11 +782,15 @@ void Dialog::setType(WindowType type)
         setFlags(Qt::FramelessWindowHint | flags());
     }
 
-    if (type == Tooltip) {
+    if (d->backgroundHints == Dialog::NoBackground) {
+        d->frameSvgItem->setImagePath(QString());
+    } else {
+        if (d->type == Tooltip) {
             d->frameSvgItem->setImagePath("widgets/tooltip");
         } else {
             d->frameSvgItem->setImagePath("dialogs/background");
         }
+    }
 
     if (type == Dock) {
         KWindowSystem::setOnAllDesktops(winId(), true);
@@ -819,7 +844,9 @@ void Dialog::focusOutEvent(QFocusEvent *ev)
 
 void Dialog::showEvent(QShowEvent *event)
 {
+    if (d->backgroundHints != Dialog::NoBackground) {
         DialogShadows::self()->addWindow(this, d->frameSvgItem->enabledBorders());
+    }
     QQuickWindow::showEvent(event);
 }
 
@@ -882,6 +909,22 @@ void Dialog::setOutputOnly(bool outputOnly)
     emit outputOnlyChanged();
 }
 
+Dialog::BackgroundHints Dialog::backgroundHints() const
+{
+    return d->backgroundHints;
+}
+
+void Dialog::setBackgroundHints(Dialog::BackgroundHints hints)
+{
+    if (d->backgroundHints == hints) {
+        return;
+    }
+
+    d->backgroundHints = hints;
+    d->updateTheme();
+    emit backgroundHintsChanged();
+}
+
 }
 
 #include "moc_dialog.cpp"

src/plasmaquick/dialog.h

@@ -116,6 +116,13 @@ class PLASMAQUICK_EXPORT Dialog : public QQuickWindow, public QQmlParserStatus
      */
     Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFramelessFlags NOTIFY flagsChanged)
 
+    /**
+     * This property holds how (and if at all) the dialog should draw its own background
+     * or if it is complete responsibility of the content item to render a background.
+     * Note that in case of NoBackground it loses kwin side shadows and blur
+     */
+    Q_PROPERTY(BackgroundHints backgroundHints READ backgroundHints WRITE setBackgroundHints NOTIFY backgroundHintsChanged)
+
     Q_CLASSINFO("DefaultProperty", "mainItem")
 
 public:
@@ -129,6 +136,12 @@ public:
     };
     Q_ENUMS(WindowType)
 
+    enum BackgroundHints {
+        NoBackground = 0,         /**< Not drawing a background under the applet, the dialog has its own implementation */
+        StandardBackground = 1   /**< The standard background from the theme is drawn */
+    };
+    Q_ENUMS(BackgroundHints)
+
     Dialog(QQuickItem *parent = 0);
     ~Dialog();
 
@@ -155,6 +168,9 @@ public:
     void setOutputOnly(bool outputOnly);
     bool isOutputOnly() const;
 
+    BackgroundHints backgroundHints() const;
+    void setBackgroundHints(BackgroundHints hints);
+
     /**
      * @returns The suggested screen position for the popup
      * @arg item the item the popup has to be positioned relatively to. if null, the popup will be positioned in the center of the window
@@ -170,6 +186,7 @@ Q_SIGNALS:
     void hideOnWindowDeactivateChanged();
     void outputOnlyChanged();
     void flagsChanged();
+    void backgroundHintsChanged();
     /**
      * Emitted when the @see hideOnWindowDeactivate property is @c true and this dialog lost focus to a
      * window that is neither a parent dialog to nor a child dialog of this dialog.