Merge lp:~fboucault/unity-2d/declarativeview_transparent_background_property into lp:unity-2d/3.0

[Florian Boucault]

Added property Unity2DDeclarativeView::transparentBackground.
Removed spread specific optimisations that are now part of Unity2DDeclarativeView.

Note: setting attribute WA_TranslucentBackground internally sets the attribute WA_NoSystemBackground.

[Ugo Riboni (uriboni)]

I didn't spot any regressions with and without a compositor running.
Code looks ok.

review: Approve

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-06-07 13:46:38 +0000
+++ launcher/app/launcherview.cpp	2011-06-13 00:37:40 +0000
@@ -61,13 +61,7 @@
     Unity2DDeclarativeView(parent),
     m_superKeyPressed(false), m_superKeyHeld(false)
 {
-    if (QX11Info::isCompositingManagerRunning()) {
-        setAttribute(Qt::WA_TranslucentBackground);
-        viewport()->setAttribute(Qt::WA_TranslucentBackground);
-    } else {
-        setAttribute(Qt::WA_OpaquePaintEvent);
-        setAttribute(Qt::WA_NoSystemBackground);
-    }
+    setTransparentBackground(QX11Info::isCompositingManagerRunning());
 
     m_superKeyHoldTimer.setSingleShot(true);
     m_superKeyHoldTimer.setInterval(KEY_HOLD_THRESHOLD);
 
=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-04-29 16:26:25 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-06-13 00:37:40 +0000
@@ -4,6 +4,8 @@
 Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
     QDeclarativeView(parent), m_useOpenGL(false)
 {
+    setAttribute(Qt::WA_NoSystemBackground);
+    setTransparentBackground(false);
 }
 
 bool Unity2DDeclarativeView::useOpenGL() const
@@ -34,4 +36,19 @@
     Q_EMIT useOpenGLChanged(useOpenGL);
 }
 
+bool Unity2DDeclarativeView::transparentBackground() const
+{
+    return m_transparentBackground;
+}
+
+void Unity2DDeclarativeView::setTransparentBackground(bool transparentBackground)
+{
+    setAttribute(Qt::WA_TranslucentBackground, transparentBackground);
+    viewport()->setAttribute(Qt::WA_TranslucentBackground, transparentBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent, !transparentBackground);
+
+    m_transparentBackground = transparentBackground;
+    Q_EMIT transparentBackgroundChanged(transparentBackground);
+}
+
 #include <unity2ddeclarativeview.moc>
 
=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2011-04-29 16:26:25 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2011-06-13 00:37:40 +0000
@@ -8,18 +8,26 @@
     Q_OBJECT
 
     Q_PROPERTY(bool useOpenGL READ useOpenGL WRITE setUseOpenGL NOTIFY useOpenGLChanged)
+    Q_PROPERTY(bool transparentBackground READ transparentBackground WRITE setTransparentBackground NOTIFY transparentBackgroundChanged)
 
 public:
     Unity2DDeclarativeView(QWidget *parent = 0);
 
+    // getters
     bool useOpenGL() const;
+    bool transparentBackground() const;
+
+    // setters
     void setUseOpenGL(bool);
+    void setTransparentBackground(bool);
 
 Q_SIGNALS:
     void useOpenGLChanged(bool);
+    void transparentBackgroundChanged(bool);
 
 private:
     bool m_useOpenGL;
+    bool m_transparentBackground;
 };
 
 Q_DECLARE_METATYPE(Unity2DDeclarativeView*)
 
=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-05-23 17:23:38 +0000
+++ places/app/dashdeclarativeview.cpp	2011-06-13 00:37:40 +0000
@@ -53,14 +53,7 @@
 , m_expanded(false)
 {
     setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
-
-    if (QX11Info::isCompositingManagerRunning()) {
-        setAttribute(Qt::WA_TranslucentBackground);
-        viewport()->setAttribute(Qt::WA_TranslucentBackground);
-    } else {
-        setAttribute(Qt::WA_OpaquePaintEvent);
-        setAttribute(Qt::WA_NoSystemBackground);
-    }
+    setTransparentBackground(QX11Info::isCompositingManagerRunning());
 
     QDesktopWidget* desktop = QApplication::desktop();
     connect(desktop, SIGNAL(resized(int)), SIGNAL(screenGeometryChanged()));
 
=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-06-07 21:07:50 +0000
+++ spread/app/spread.cpp	2011-06-13 00:37:40 +0000
@@ -62,10 +62,6 @@
        fullscreen */
     view.setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
 
-    /* Performance tricks */
-    view.setAttribute(Qt::WA_OpaquePaintEvent);
-    view.setAttribute(Qt::WA_NoSystemBackground);
-
     view.engine()->addImportPath(unity2dImportPath());
     /* Note: baseUrl seems to be picky: if it does not end with a slash,
        setSource() will fail */