Merge lp:~osomon/unity-2d/offscreenQuicklists into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Adjust the position of quicklists so that they never get offscreen.

Note to the reviewer: when testing quicklists, there are two different code paths to test: compositing enabled and compositing disabled. With metacity, it’s simply a matter of changing the value of the GConf key at /apps/metacity/general/compositing_manager.

Also note that the launcher is not aware of live changes (it doesn’t get notified if the window manager suddenly decides to support compositing, this is a known issue documented in the code), so it needs to be restarted to test those two code paths.

[Aurélien Gâteau (agateau)]

# Functional

Works well, except for a tiny bug in composited mode: the arrow and the tooltip seems to overlap. This screenshot should make it clearer.

http://wstaw.org/m/2011/03/03/unity-2d-launcher-tooltip_.png

I think this can be fixed by calling painter.setCompositionMode(QPainter::Source) before painting the arrow.

# Code

You can make m_arrow a QPixmap instead of a QPixmap*. It is not QObject-based and is implicitly shared so it is more common to use QPixmaps as values.

Instead of adding the m_maskNeedsUpdate, would it be possible to simply call updateMask() in setFolded()? That would simplify the code a bit.

review: Needs Fixing

[lp:~osomon/unity-2d/offscreenQuicklists]

424. By Olivier Tilloy on 2011-03-03

Paint the arrow over the quicklist, don’t blend pixels.

425. By Olivier Tilloy on 2011-03-03

Make m_arrow a QPixmap instead of a QPixmap*.

426. By Olivier Tilloy on 2011-03-03

Directly update the mask when the menu has moved.

[Olivier Tilloy (osomon)]

Thanks for the review, the very valid points you raised and the suggestions.
They were all addressed/applied.

[Aurélien Gâteau (agateau)]

Looks good now.

review: Approve

=== modified file 'launcher/UnityApplications/launchermenu.cpp'
--- launcher/UnityApplications/launchermenu.cpp	2011-02-09 16:41:19 +0000
+++ launcher/UnityApplications/launchermenu.cpp	2011-03-03 15:21:31 +0000
@@ -27,6 +27,8 @@
 #include <QResizeEvent>
 #include <QBitmap>
 #include <QX11Info>
+#include <QDesktopWidget>
+#include <QPainter>
 
 LauncherContextualMenu::LauncherContextualMenu():
     QMenu(0), m_folded(true), m_launcherItem(NULL), m_titleAction(NULL)
@@ -54,6 +56,14 @@
     /* Custom appearance. */
     loadCSS();
 
+    /* Load the pixmap for the arrow. It is drawn separately as its position
+       may vary depending on the position of the menu on the screen. */
+    if (transparencyAvailable()) {
+        m_arrow.load("artwork:tooltip/arrow.png");
+    } else {
+        m_arrow.load("artwork:tooltip/arrow_no_transparency.png");
+    }
+
     /* First action used to display the title of the item */
     m_titleAction = new QAction(this);
     m_titleAction->setEnabled(false);
@@ -95,17 +105,22 @@
 }
 
 void
+LauncherContextualMenu::updateMask()
+{
+    QPixmap pixmap(size());
+    render(&pixmap, QPoint(), QRegion(),
+           QWidget::DrawWindowBackground | QWidget::DrawChildren | QWidget::IgnoreMask);
+    setMask(pixmap.createMaskFromColor("red"));
+}
+
+void
 LauncherContextualMenu::resizeEvent(QResizeEvent* event)
 {
+    QMenu::resizeEvent(event);
     /* If transparent windows are not available use the XShape extension */
     if (!transparencyAvailable()) {
-        QPixmap pixmap(event->size());
-        render(&pixmap, QPoint(), QRegion(),
-               QWidget::DrawWindowBackground | QWidget::DrawChildren | QWidget::IgnoreMask);
-        setMask(pixmap.createMaskFromColor("red"));
+        updateMask();
     }
-
-    QMenu::resizeEvent(event);
 }
 
 bool
@@ -138,6 +153,7 @@
     if (isVisible())
         return;
 
+    m_arrowY = 6;
     move(x, y - minimumSize().height() / 2);
     QMenu::show();
 }
@@ -183,6 +199,22 @@
     } else {
         addSeparator();
         m_launcherItem->createMenuActions();
+
+        QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+        if (height() <= screenGeometry.height()) {
+            /* Adjust the position of the menu only if it fits entirely on the screen. */
+            int menuBottomEdge = y() + height();
+            int screenBottomEdge = screenGeometry.y() + screenGeometry.height();
+            if (menuBottomEdge > screenBottomEdge) {
+                /* The menu goes offscreen, shift it upwards. */
+                m_arrowY += menuBottomEdge - screenBottomEdge;
+                move(x(), screenBottomEdge - height());
+                if (!transparencyAvailable()) {
+                    /* The arrow has moved relatively to the menu. */
+                    updateMask();
+                }
+            }
+        }
     }
 
     m_folded = folded;
@@ -190,6 +222,17 @@
     emit foldedChanged(m_folded);
 }
 
+void
+LauncherContextualMenu::paintEvent(QPaintEvent* event)
+{
+    QMenu::paintEvent(event);
+
+    /* Draw the arrow. */
+    QPainter painter(this);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.drawPixmap(0, m_arrowY, m_arrow);
+}
+
 LauncherItem*
 LauncherContextualMenu::launcherItem() const
 {

=== modified file 'launcher/UnityApplications/launchermenu.h'
--- launcher/UnityApplications/launchermenu.h	2010-12-01 13:10:57 +0000
+++ launcher/UnityApplications/launchermenu.h	2011-03-03 15:21:31 +0000
@@ -22,6 +22,7 @@
 
 #include <QMenu>
 #include <QTimer>
+#include <QPixmap>
 
 class LauncherItem;
 
@@ -59,6 +60,9 @@
     void foldedChanged(bool);
     void titleChanged(QString);
 
+protected:
+    void paintEvent(QPaintEvent* event);
+
 private:
     void loadCSS();
     QTimer m_hidingDelayTimer;
@@ -66,6 +70,12 @@
     LauncherItem* m_launcherItem;
     QString m_title;
     QAction* m_titleAction;
+
+    QPixmap m_arrow;
+    int m_arrowY;
+
+private Q_SLOTS:
+    void updateMask();
 };
 
 #endif // LAUNCHERMENU_H

=== added file 'launcher/artwork/tooltip/arrow.png'
Binary files launcher/artwork/tooltip/arrow.png	1970-01-01 00:00:00 +0000 and launcher/artwork/tooltip/arrow.png	2011-03-03 15:21:31 +0000 differ
=== added file 'launcher/artwork/tooltip/arrow_no_transparency.png'
Binary files launcher/artwork/tooltip/arrow_no_transparency.png	1970-01-01 00:00:00 +0000 and launcher/artwork/tooltip/arrow_no_transparency.png	2011-03-03 15:21:31 +0000 differ
=== modified file 'launcher/artwork/tooltip/background.png'
Binary files launcher/artwork/tooltip/background.png	2010-11-29 02:42:22 +0000 and launcher/artwork/tooltip/background.png	2011-03-03 15:21:31 +0000 differ
=== modified file 'launcher/artwork/tooltip/background_no_transparency.png'
Binary files launcher/artwork/tooltip/background_no_transparency.png	2010-11-29 02:42:22 +0000 and launcher/artwork/tooltip/background_no_transparency.png	2011-03-03 15:21:31 +0000 differ
=== modified file 'launcher/launchermenu.css'
--- launcher/launchermenu.css	2010-11-29 04:36:02 +0000
+++ launcher/launchermenu.css	2011-03-03 15:21:31 +0000
@@ -26,11 +26,11 @@
 }
 
 QMenu[transparencyAvailable=true] {
-    border-image: url(artwork:tooltip/background.png) 24px 5px 4px 15px Repeat Repeat;
+    border-image: url(artwork:tooltip/background.png) 5px 5px 4px 15px Repeat Repeat;
 }
 
 QMenu[transparencyAvailable=false] {
-    border-image: url(artwork:tooltip/background_no_transparency.png) 24px 5px 4px 15px Repeat Repeat;
+    border-image: url(artwork:tooltip/background_no_transparency.png) 5px 5px 4px 15px Repeat Repeat;
 }