Merge lp:~aacid/unity-2d/unity-2d_backport_shell_unity2ddeclarativeview into lp:unity-2d

[Albert Astals Cid]

Add visibleChanged() signal to unity2ddeclarativeview

[Albert Astals Cid (aacid)]

This MR includes bits of r921 and r934 in -shell that were MR'ed at
https://code.launchpad.net/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests/+merge/89236
and
https://code.launchpad.net/~unity-2d-team/unity-2d/update-launcher-pips-shell/+merge/89679

[Florian Boucault (fboucault)]

Instead of a shown signal I'm thinking it might be better to have the 'visible' property defined as done in rev 859 of lp:~fboucault/unity-2d/nautilus_window_instead_of_wallpaper

http://bazaar.launchpad.net/~fboucault/unity-2d/nautilus_window_instead_of_wallpaper/revision/859

[Albert Astals Cid (aacid)]

Well, the idea of these MR is to reduce the diff size between unity-2d-shell and unity-2d, I'm not saying your approach is better or worse but if we add that we increase the diff size instead of reducing it :D

[Florian Boucault (fboucault)]

Decide if it is better or worse, settle on one solution, get it merged into lp:unity-2d and in unity-2d-shell. Then we will have good code and no diff.

[Albert Astals Cid (aacid)]

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

review: Disapprove

[Albert Astals Cid (aacid)]

Err? Ignore my disapprove, don't know how it got there

[Michał Sawicz (saviq)]

Code looks good, tests pass.

review: Approve

[Michał Sawicz (saviq)]

Let's wait a bit for this.

review: Abstain

[Michał Sawicz (saviq)]

review: Approve

[Michał Sawicz (saviq)]

MR Approval awaiting lift of code freeze.

review: Abstain

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-12-08 19:41:38 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-02-03 12:13:24 +0000
@@ -21,6 +21,7 @@
 #include <QVariant>
 #include <QX11Info>
 #include <QFileInfo>
+#include <QShowEvent>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -158,6 +159,17 @@
     Q_EMIT globalPositionChanged(globalPosition());
 }
 
+void Unity2DDeclarativeView::showEvent(QShowEvent* event)
+{
+    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	2011-12-08 19:41:38 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2012-02-03 12:13:24 +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,10 +45,13 @@
     void useOpenGLChanged(bool);
     void transparentBackgroundChanged(bool);
     void globalPositionChanged(QPoint);
+    void visibleChanged(bool);
 
 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 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2012-01-26 13:12:12 +0000
+++ places/app/dashdeclarativeview.cpp	2012-02-03 12:13:24 +0000
@@ -134,7 +134,7 @@
 void
 DashDeclarativeView::showEvent(QShowEvent *event)
 {
-    QDeclarativeView::showEvent(event);
+    Unity2DDeclarativeView::showEvent(event);
     /* Note that this has to be called everytime the window is shown, as the WM
        will remove the flags when the window is hidden */
     setWMFlags();

=== modified file 'spread/app/spreadview.cpp'
--- spread/app/spreadview.cpp	2011-12-08 18:39:18 +0000
+++ spread/app/spreadview.cpp	2012-02-03 12:13:24 +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-03 12:13:24 +0000
@@ -39,13 +39,10 @@
 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:
     void outsideClick();
-    void visibleChanged(bool visible);
 };
 
 #endif // SPREADVIEW_H