Merge lp:~aacid/unity-2d/unity-2d-shell_visible_changed_in_unity2ddeclarativeview into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Define new 'visible' property on Unity2dDeclarativeView.

Clean up descendant classes handling of hideEvent and showEvent.

Merge rev 859 of lp:~fboucault/unity-2d/nautilus_window_instead_of_wallpaper as suggested by Florian

[Albert Astals Cid (aacid)]

You can find the unity-2d MR at https://code.launchpad.net/~aacid/unity-2d/unity-2d_backport_shell_unity2ddeclarativeview/+merge/91036

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'libunity-2d-private/src/inputshapemanager.cpp'
--- libunity-2d-private/src/inputshapemanager.cpp	2012-01-12 18:47:24 +0000
+++ libunity-2d-private/src/inputshapemanager.cpp	2012-02-01 15:01:22 +0000
@@ -60,7 +60,7 @@
         if (m_target != NULL) {
             // due to the way xshape works we need to re-apply the shaping every time the target window
             // is mapped again.
-            connect(m_target, SIGNAL(shown()), SLOT(updateManagedShape()));
+            connect(m_target, SIGNAL(visibleChanged(bool)), SLOT(updateManagedShape()));
             connect(m_target, SIGNAL(sceneResized(QSize)), SLOT(updateManagedShape()));
         }
         Q_EMIT targetChanged();

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-01-24 04:05:56 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-02-01 15:01:22 +0000
@@ -159,11 +159,17 @@
     Q_EMIT globalPositionChanged(globalPosition());
 }
 
-void Unity2DDeclarativeView::showEvent(QShowEvent *event)
+void Unity2DDeclarativeView::showEvent(QShowEvent* event)
 {
-    Q_EMIT shown();
+    QDeclarativeView::showEvent(event);
+    Q_EMIT visibleChanged(true);
 }
 
+void Unity2DDeclarativeView::hideEvent(QHideEvent* event)
+{
+    QDeclarativeView::hideEvent(event);
+    Q_EMIT visibleChanged(false);
+}
 
 /* Obtaining & Discarding Keyboard Focus for Window on Demand
  *

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2012-01-24 16:20:13 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2012-02-01 15:01:22 +0000
@@ -26,6 +26,7 @@
     Q_PROPERTY(bool useOpenGL READ useOpenGL WRITE setUseOpenGL NOTIFY useOpenGLChanged)
     Q_PROPERTY(bool transparentBackground READ transparentBackground WRITE setTransparentBackground NOTIFY transparentBackgroundChanged)
     Q_PROPERTY(QPoint globalPosition READ globalPosition NOTIFY globalPositionChanged)
+    Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)
 
 public:
     Unity2DDeclarativeView(QWidget *parent = 0);
@@ -44,13 +45,14 @@
     void useOpenGLChanged(bool);
     void transparentBackgroundChanged(bool);
     void globalPositionChanged(QPoint);
-    void shown();
+    void visibleChanged(bool);
     void activeWorkspaceChanged();
 
 protected:
     void setupViewport();
     virtual void moveEvent(QMoveEvent* event);
     virtual void showEvent(QShowEvent *event);
+    virtual void hideEvent(QHideEvent* event);
 
 protected Q_SLOTS:
     void forceActivateWindow();

=== modified file 'spread/app/spreadview.cpp'
--- spread/app/spreadview.cpp	2011-12-08 18:39:18 +0000
+++ spread/app/spreadview.cpp	2012-02-01 15:01:22 +0000
@@ -97,15 +97,3 @@
 
     return false;
 }
-
-void SpreadView::showEvent(QShowEvent *event)
-{
-    Q_UNUSED(event);
-    Q_EMIT visibleChanged(true);
-}
-
-void SpreadView::hideEvent(QHideEvent *event)
-{
-    Q_UNUSED(event);
-    Q_EMIT visibleChanged(false);
-}

=== modified file 'spread/app/spreadview.h'
--- spread/app/spreadview.h	2011-12-08 18:39:18 +0000
+++ spread/app/spreadview.h	2012-02-01 15:01:22 +0000
@@ -39,8 +39,6 @@
 protected:
     virtual void focusInEvent( QFocusEvent * event );
     virtual void focusOutEvent( QFocusEvent * event );
-    virtual void showEvent(QShowEvent *event);
-    virtual void hideEvent(QHideEvent *event);
     bool eventFilter(QObject *obj, QEvent *event);
 
 Q_SIGNALS: