Merge lp:~unity-2d-team/unity-2d/dash-not-dock into lp:unity-2d/3.0

[Ugo Riboni]

[dash] Make the dash a regular window without borders and request the WM not to show it in pagers.
This should hopefully make the situation a bit less confusing for metacity, and the dash-related corruption problems both with and without the metacity compositor active.

[Olivier Tilloy (osomon)]

/* Note that this has to be called everytime the window is shown, as the WM
   will to clean the flags when the window is hidden (whitdrawn) */

Grammar and spelling parser choked…

s/will to/will/
s/whitdrawn/withdrawn/

review: Needs Fixing

[Olivier Tilloy (osomon)]

- setGeometry(availableGeometry());
+ move(availableGeometry().topLeft());
+ setFixedSize(availableGeometry().size());

You’re calling availableGeometry() twice here, you should call it only once and assign the result to a local variable to re-use in the calls to move(…) and setFixedSize(…).

review: Needs Fixing

[lp:~unity-2d-team/unity-2d/dash-not-dock]

531. By Ugo Riboni on 2011-04-12

Fix some code style, comments and other minor remarks from code review

[Olivier Tilloy (osomon)]

That works well, both with and without compositing enabled. Good job!

review: Approve

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-04-07 11:34:25 +0000
+++ places/app/dashdeclarativeview.cpp	2011-04-12 17:31:00 +0000
@@ -52,7 +52,7 @@
 , m_mode(HiddenMode)
 , m_expanded(false)
 {
-    setAttribute(Qt::WA_X11NetWmWindowTypeDock);
+    setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
 
     if (QX11Info::isCompositingManagerRunning()) {
         setAttribute(Qt::WA_TranslucentBackground);
@@ -84,7 +84,9 @@
 void
 DashDeclarativeView::fitToAvailableSpace()
 {
-    setGeometry(availableGeometry());
+    QRect rect = availableGeometry();
+    move(rect.topLeft());
+    setFixedSize(rect.size());
 }
 
 void
@@ -92,9 +94,12 @@
 {
     QRect rect = availableGeometry();
 
-    rect.setWidth(DASH_DESKTOP_WIDTH);
-    rect.setHeight(m_expanded ? DASH_DESKTOP_EXPANDED_HEIGHT : DASH_DESKTOP_COLLAPSED_HEIGHT);
-    setGeometry(rect);
+    rect.setWidth(qMin(DASH_DESKTOP_WIDTH, rect.width()));
+    rect.setHeight(qMin(m_expanded ? DASH_DESKTOP_EXPANDED_HEIGHT : DASH_DESKTOP_COLLAPSED_HEIGHT,
+                        rect.height()));
+
+    move(rect.topLeft());
+    setFixedSize(rect.size());
 }
 
 void
@@ -113,6 +118,31 @@
 }
 
 void
+DashDeclarativeView::setWMFlags()
+{
+    Display *display = QX11Info::display();
+    Atom stateAtom = XInternAtom(display, "_NET_WM_STATE", False);
+    Atom propAtom;
+
+    propAtom = XInternAtom(display, "_NET_WM_STATE_SKIP_TASKBAR", False);
+    XChangeProperty(display, effectiveWinId(), stateAtom,
+                    XA_ATOM, 32, PropModeAppend, (unsigned char *) &propAtom, 1);
+
+    propAtom = XInternAtom(display, "_NET_WM_STATE_SKIP_PAGER", False);
+    XChangeProperty(display, effectiveWinId(), stateAtom,
+                    XA_ATOM, 32, PropModeAppend, (unsigned char *) &propAtom, 1);
+}
+
+void
+DashDeclarativeView::showEvent(QShowEvent *event)
+{
+    QDeclarativeView::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();
+}
+
+void
 DashDeclarativeView::setActive(bool value)
 {
     if (value != active()) {
@@ -147,18 +177,10 @@
     DashDeclarativeView::DashMode oldMode = m_mode;
     m_mode = mode;
     if (m_mode == HiddenMode) {
-        /* Before hiding and showing the window it is important to remove and put back
-           the dock flag. This is because we need the window to be a dock to have the
-           WM maintain it on top of all others properly. However metacity has a bug
-           that causes corruption when hiding dock windows in certain conditions.
-           Therefore we remove the flag before hiding, which is enough to fix the
-           metacity issue. */
-        setAttribute(Qt::WA_X11NetWmWindowTypeDock, false);
         hide();
         m_launcherClient->endForceVisible();
         activeChanged(false);
     } else {
-        setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
         show();
         raise();
         // We need a delay, otherwise the window may not be visible when we try to activate it

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-03-23 11:30:21 +0000
+++ places/app/dashdeclarativeview.h	2011-04-12 17:31:00 +0000
@@ -74,6 +74,7 @@
 
 protected:
     void resizeEvent(QResizeEvent*);
+    virtual void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
     void onWorkAreaResized(int screen);
@@ -85,6 +86,7 @@
     void focusOutEvent(QFocusEvent* event);
     void keyPressEvent(QKeyEvent* event);
     void updateMask();
+    void setWMFlags();
 
     LauncherClient* m_launcherClient;
     DashMode m_mode;