Merge lp:~lukas-kde/unity8/closeAppsFromQuicklist into lp:unity8

[Lukáš Tinkl]

launcher parity: close apps from quicklist

launcher parity: close apps from quicklist

- adds a Quit item to the launcher quicklist
- reverts the visual appearance to the old design of popup menus
- invokes the popup menu also on the right mouse click

 * Are there any related MPs required for this MP to build/function as expected? Please list.

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * Did you make sure that your branch does not contain spurious tags?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

No (however, there is a revert to the old design)

 * Did you have a look at the warnings when running tests? Can they be reduced?

Yes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1810
http://jenkins.qa.ubuntu.com/job/unity8-ci/5803/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/94
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21099

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5803/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

I see you have lp:~lukas-kde/unity8/highdpi-mousetouchadaptor in this branch. Either remove those changes or make lp:~lukas-kde/unity8/highdpi-mousetouchadaptor a prerequisite.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

In qml/Launcher/LauncherPanel.qml

"""
- __foregroundColor: "black"
+ __foregroundColor: Theme.palette.selected.backgroundText
"""

"Theme" is deprecated. Please use the context variable "theme" instead. We have tons of warnings on this already. See https://code.launchpad.net/~dandrader/unity8/deprecatedTheme/+merge/262216

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

I would like to see a qml test launches an app and then closes it using this "quit" quick list menu entry.

I should also be able to manually test this feature or try it out (eg, via "make tryShell"), without having to flash a device for that.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> I would like to see a qml test launches an app and then closes it using this
> "quit" quick list menu entry.

There is already a test for this, albeit not a QML one: launchermodeltest.cp, void testQuitMenuItem()

> I should also be able to manually test this feature or try it out (eg, via
> "make tryShell"), without having to flash a device for that.

Right, I'll see what I can do with that but I'd prefer doing that in a separate MP; it goes a bit beyond the scope of this review, none of the current quick list actions are testable from QML yet (Pin/Unpin etc).

[lp:~lukas-kde/unity8/closeAppsFromQuicklist]

1812. By Lukáš Tinkl on 2015-06-24

address MP issues

1813. By Lukáš Tinkl on 2015-06-24

[ Albert Astals Cid ]
* Refactor QmlTest.cmake module so that all tests can go through it.
  Also a bit of cleanup around tests.
* Support fallback images for dash card and preview widgets (LP:
  #1324142)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Fix Shell tests
[ Josh Arenson ]
* Refactor greeter emulator to unlock the greeter via dbus
[ Lukáš Tinkl ]
* respect target window's devicePixelRatio in MouseTouchAdaptor
[ Michael Zanetti ]
* Refactor QmlTest.cmake module so that all tests can go through it.
  Also a bit of cleanup around tests.
[ Michał Sawicz ]
* Refactor QmlTest.cmake module so that all tests can go through it.
  Also a bit of cleanup around tests.
[ handsome_feng ]
* Forbid closing apps during the edge gesture. (LP: #1445572)
* Removed the horizonal rule on pin unlock screen. (LP: #1368798)
[ handsome_feng<email address hidden> ]
* Forbid closing apps during the edge gesture. (LP: #1445572)
* No-change rebuild against Qt 5.4.2.
[ Michał Sawicz ]
* Implement full-shell rotation (LP: #1210199)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ Mirco Müller ]
* Implemented autopilot-test and fake-sensors for shell-rotation.

1814. By Lukáš Tinkl on 2015-07-02

restore light menu color, arrow pointing always towards the launcher

1815. By Lukáš Tinkl on 2015-07-02

calculate the arrow's offset correctly

1816. By Lukáš Tinkl on 2015-07-07

implement missing bits of the "running" interfaces

1817. By Lukáš Tinkl on 2015-07-07

fix white-on-white text in the quicklist

1818. By Lukáš Tinkl on 2015-07-07

emit dataChanged

1819. By Lukáš Tinkl on 2015-07-07

emit dataChanged(Running) correctly when the app appears/disappears

1820. By Lukáš Tinkl on 2015-07-07

no need to emit RoleRunning twice

1821. By Lukáš Tinkl on 2015-07-07

sync items when changing running state; set the initial running state in refresh()

1822. By Lukáš Tinkl on 2015-07-07

set the running status also for the already pinned apps

1823. By Lukáš Tinkl on 2015-07-07

sset the item to "running" in all cases when it appears

1824. By Lukáš Tinkl on 2015-07-21

merge and fix conflict

1825. By Lukáš Tinkl on 2015-07-21

drop dbusinterface changes

1826. By Lukáš Tinkl on 2015-07-23

rebase on top of lp:~macslow/unity8/use-set-progress-api

1827. By Lukáš Tinkl on 2015-07-29

re-merge again on top of use-set-progress-api to fix failing QML tests

Unmerged revisions

=== modified file 'plugins/Unity/Launcher/asadapter.cpp'
--- plugins/Unity/Launcher/asadapter.cpp	2015-02-11 14:13:26 +0000
+++ plugins/Unity/Launcher/asadapter.cpp	2015-06-18 11:46:46 +0000
@@ -34,12 +34,12 @@
     m_accounts->deleteLater();
 }
 
-void ASAdapter::syncItems(QList<LauncherItem *> m_list)
+void ASAdapter::syncItems(const QList<LauncherItem*> &list)
 {
     if (m_accounts && !m_user.isEmpty()) {
         QList<QVariantMap> items;
 
-        Q_FOREACH(LauncherItem *item, m_list) {
+        Q_FOREACH(LauncherItem *item, list) {
             items << itemToVariant(item);
         }
 

=== modified file 'plugins/Unity/Launcher/asadapter.h'
--- plugins/Unity/Launcher/asadapter.h	2015-02-11 14:13:26 +0000
+++ plugins/Unity/Launcher/asadapter.h	2015-06-18 11:46:46 +0000
@@ -29,7 +29,7 @@
     ASAdapter();
     ~ASAdapter();
 
-    void syncItems(QList<LauncherItem*> m_list);
+    void syncItems(const QList<LauncherItem*> &list);
 
 private:
     QVariantMap itemToVariant(LauncherItem *item) const;

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-11-19 17:43:09 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2015-06-18 11:46:46 +0000
@@ -40,10 +40,15 @@
     nameAction.setActionId("launch_item");
     nameAction.setText(m_name);
     m_quickList->appendAction(nameAction);
+
     QuickListEntry pinningAction;
     pinningAction.setActionId("pin_item");
     pinningAction.setText(gettext("Pin shortcut"));
     m_quickList->appendAction(pinningAction);
+
+    m_quitAction.setActionId("stop_item");
+    m_quitAction.setIcon("application-exit");
+    m_quitAction.setText(gettext("Quit"));
 }
 
 QString LauncherItem::appId() const
@@ -110,6 +115,11 @@
 {
     if (m_running != running) {
         m_running = running;
+        if (m_running) { // add the quit action
+            m_quickList->appendAction(m_quitAction);
+        } else { // remove the quit action
+            m_quickList->removeAction(m_quitAction);
+        }
         Q_EMIT runningChanged(running);
     }
 }

=== modified file 'plugins/Unity/Launcher/launcheritem.h'
--- plugins/Unity/Launcher/launcheritem.h	2014-09-02 18:22:37 +0000
+++ plugins/Unity/Launcher/launcheritem.h	2015-06-18 11:46:46 +0000
@@ -70,6 +70,7 @@
     bool m_countVisible;
     bool m_focused;
     QuickListModel *m_quickList;
+    QuickListEntry m_quitAction;
 
     friend class LauncherModel;
 };

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2015-03-30 17:36:42 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2015-06-18 11:46:46 +0000
@@ -82,9 +82,14 @@
             return item->progress();
         case RoleFocused:
             return item->focused();
+        case RoleRunning:
+            return item->running();
+        default:
+            qWarning() << Q_FUNC_INFO << "missing role, implement me";
+            return QVariant();
     }
 
-    return QVariant();
+    return LauncherModelInterface::data(index, role);
 }
 
 unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
@@ -134,7 +139,7 @@
         if (index == -1 || index == currentIndex) {
             m_list.at(currentIndex)->setPinned(true);
             QModelIndex modelIndex = this->index(currentIndex);
-            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
+            Q_EMIT dataChanged(modelIndex, modelIndex, {RolePinned});
         } else {
             move(currentIndex, index);
             // move() will store the list to the backend itself, so just exit at this point.
@@ -147,7 +152,7 @@
 
         DesktopFileHandler desktopFile(appId);
         if (!desktopFile.isValid()) {
-            qWarning() << "Can't pin this application, there is no .destkop file available.";
+            qWarning() << "Can't pin this application, there is no .desktop file available.";
             return;
         }
 
@@ -172,7 +177,7 @@
 
 void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)
 {
-    int index = findApplication(appId);
+    const int index = findApplication(appId);
     if (index < 0) {
         return;
     }
@@ -180,7 +185,7 @@
     LauncherItem *item = m_list.at(index);
     QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());
     if (model) {
-        QString actionId = model->get(actionIndex).actionId();
+        const QString actionId = model->get(actionIndex).actionId();
 
         // Check if this is one of the launcher actions we handle ourselves
         if (actionId == "pin_item") {
@@ -191,7 +196,8 @@
             }
         } else if (actionId == "launch_item") {
             QDesktopServices::openUrl(getUrlForAppId(appId));
-
+        } else if (actionId == "stop_item") { // Quit
+            m_appManager->stopApplication(appId);
         // Nope, we don't know this action, let the backend forward it to the application
         } else {
             // TODO: forward quicklist action to app, possibly via m_dbusIface
@@ -272,6 +278,7 @@
 
 void LauncherModel::setOnlyPinned(bool onlyPinned) {
     Q_UNUSED(onlyPinned);
+    // FIXME implement showing only pinned apps
     qWarning() << "This launcher implementation does not support showing only pinned apps";
 }
 
@@ -289,7 +296,7 @@
 
 void LauncherModel::unpin(const QString &appId)
 {
-    int index = findApplication(appId);
+    const int index = findApplication(appId);
     if (index < 0) {
         return;
     }
@@ -298,7 +305,7 @@
         if (m_list.at(index)->pinned()) {
             m_list.at(index)->setPinned(false);
             QModelIndex modelIndex = this->index(index);
-            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
+            Q_EMIT dataChanged(modelIndex, modelIndex, {RolePinned});
         }
     } else {
         beginRemoveRows(QModelIndex(), index, index);
@@ -320,21 +327,21 @@
 
 void LauncherModel::progressChanged(const QString &appId, int progress)
 {
-    int idx = findApplication(appId);
+    const int idx = findApplication(appId);
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setProgress(progress);
-        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleProgress);
+        Q_EMIT dataChanged(index(idx), index(idx), {RoleProgress});
     }
 }
 
 void LauncherModel::countChanged(const QString &appId, int count)
 {
-    int idx = findApplication(appId);
+    const int idx = findApplication(appId);
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCount(count);
-        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);
+        Q_EMIT dataChanged(index(idx), index(idx), {RoleCount});
         m_asAdapter->syncItems(m_list);
     }
 }
@@ -345,7 +352,7 @@
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCountVisible(countVisible);
-        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
+        Q_EMIT dataChanged(index(idx), index(idx), {RoleCountVisible});
 
         // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
         if (!countVisible && !item->pinned() && !item->recent()) {
@@ -387,7 +394,7 @@
             item->setName(desktopFile.displayName());
             item->setIcon(desktopFile.icon());
             item->setPinned(item->pinned()); // update pinned text if needed
-            Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
+            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon});
         }
     }
 
@@ -405,7 +412,7 @@
 
     // Now walk through settings and see if we need to add something
     for (int settingsIndex = 0; settingsIndex < m_settings->storedApplications().count(); ++settingsIndex) {
-        QString entry = m_settings->storedApplications().at(settingsIndex);
+        const QString entry = m_settings->storedApplications().at(settingsIndex);
         int itemIndex = -1;
         for (int i = 0; i < m_list.count(); ++i) {
             if (m_list.at(i)->appId() == entry) {
@@ -468,18 +475,19 @@
         return;
     }
 
-    int itemIndex = findApplication(app->appId());
+    const int itemIndex = findApplication(app->appId());
     if (itemIndex != -1) {
         LauncherItem *item = m_list.at(itemIndex);
         if (!item->recent()) {
             item->setRecent(true);
             m_asAdapter->syncItems(m_list);
-            Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);
+            Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});
         }
-        // Shall we paint some running/recent app highlight? If yes, do it here.
+        // TODO Shall we paint some running/recent app highlight? If yes, do it here.
     } else {
         LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
         item->setRecent(true);
+        item->setRunning(true);
         item->setFocused(app->focused());
 
         beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
@@ -501,7 +509,15 @@
         }
     }
 
-    if (appIndex > -1 && !m_list.at(appIndex)->pinned()) {
+    if (appIndex < 0) {
+        qWarning() << Q_FUNC_INFO << "appIndex not found";
+        return;
+    }
+
+    LauncherItem * item = m_list.at(appIndex);
+    item->setRunning(false);
+
+    if (!item->pinned()) {
         beginRemoveRows(QModelIndex(), appIndex, appIndex);
         m_list.takeAt(appIndex)->deleteLater();
         endRemoveRows();
@@ -511,15 +527,15 @@
 
 void LauncherModel::focusedAppIdChanged()
 {
-    QString appId = m_appManager->focusedApplicationId();
+    const QString appId = m_appManager->focusedApplicationId();
     for (int i = 0; i < m_list.count(); ++i) {
         LauncherItem *item = m_list.at(i);
         if (!item->focused() && item->appId() == appId) {
             item->setFocused(true);
-            Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);
+            Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
         } else if (item->focused() && item->appId() != appId) {
             item->setFocused(false);
-            Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);
+            Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
         }
     }
 }

=== modified file 'plugins/Unity/Launcher/quicklistentry.cpp'
--- plugins/Unity/Launcher/quicklistentry.cpp	2014-08-26 11:34:22 +0000
+++ plugins/Unity/Launcher/quicklistentry.cpp	2015-06-18 11:46:46 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Canonical, Ltd.
+/* Copyright (C) 2013, 2015 Canonical, Ltd.
  *
  * Authors:
  *  Michael Zanetti <[e-mail]>
@@ -20,7 +20,6 @@
 
 QuickListEntry::QuickListEntry()
 {
-
 }
 
 QString QuickListEntry::actionId() const
@@ -57,3 +56,8 @@
 {
     return !m_actionId.isEmpty();
 }
+
+bool QuickListEntry::operator==(const QuickListEntry &other)
+{
+    return !other.actionId().isEmpty() && other.actionId() == m_actionId;
+}

=== modified file 'plugins/Unity/Launcher/quicklistentry.h'
--- plugins/Unity/Launcher/quicklistentry.h	2014-08-26 11:34:22 +0000
+++ plugins/Unity/Launcher/quicklistentry.h	2015-06-18 11:46:46 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Canonical, Ltd.
+/* Copyright (C) 2013, 2015 Canonical, Ltd.
  *
  * Authors:
  *  Michael Zanetti <[e-mail]>
@@ -37,6 +37,8 @@
 
     bool clickable() const;
 
+    bool operator==(const QuickListEntry & other);
+
 private:
     QString m_actionId;
     QString m_text;

=== modified file 'plugins/Unity/Launcher/quicklistmodel.cpp'
--- plugins/Unity/Launcher/quicklistmodel.cpp	2013-10-02 11:00:53 +0000
+++ plugins/Unity/Launcher/quicklistmodel.cpp	2015-06-18 11:46:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013, 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -48,6 +48,17 @@
     }
 }
 
+void QuickListModel::removeAction(const QuickListEntry &entry)
+{
+    const int start = m_list.indexOf(entry);
+    if (start > -1) {
+        beginRemoveRows(QModelIndex(), start, start);
+        m_list.removeOne(entry);
+        Q_EMIT dataChanged(index(start), index(start));
+        endRemoveRows();
+    }
+}
+
 QuickListEntry QuickListModel::get(int index) const
 {
     return m_list.at(index);

=== modified file 'plugins/Unity/Launcher/quicklistmodel.h'
--- plugins/Unity/Launcher/quicklistmodel.h	2015-04-30 09:31:51 +0000
+++ plugins/Unity/Launcher/quicklistmodel.h	2015-06-18 11:46:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 201, 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -46,6 +46,8 @@
      */
     void updateAction(const QuickListEntry &entry);
 
+    void removeAction(const QuickListEntry &entry);
+
     QuickListEntry get(int index) const;
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-04-17 13:31:27 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-06-18 11:46:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 0.1
@@ -286,6 +286,7 @@
                     MouseArea {
                         id: dndArea
                         objectName: "dndArea"
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
                         anchors {
                             fill: parent
                             topMargin: launcherListView.topMargin
@@ -297,7 +298,7 @@
                         property int draggedIndex: -1
                         property var selectedItem
                         property bool preDragging: false
-                        property bool dragging: selectedItem !== undefined && selectedItem !== null && selectedItem.dragging
+                        property bool dragging: !!selectedItem && selectedItem.dragging
                         property bool postDragging: false
                         property int startX
                         property int startY
@@ -315,6 +316,15 @@
                                 return;
                             }
 
+                            if (mouse.button & Qt.RightButton) { // context menu
+                                // Opening QuickList
+                                quickList.item = clickedItem;
+                                quickList.model = launcherListView.model.get(index).quickList;
+                                quickList.appId = launcherListView.model.get(index).appId;
+                                quickList.state = "open";
+                                return
+                            }
+
                             // First/last item do the scrolling at more than 12 degrees
                             if (index == 0 || index == launcherListView.count - 1) {
                                 if (clickedItem.angle > 12) {
@@ -508,7 +518,7 @@
         id: quickListShape
         objectName: "quickListShape"
         anchors.fill: quickList
-        opacity: quickList.state === "open" ? 0.96 : 0
+        opacity: quickList.state === "open" ? 0.8 : 0
         visible: opacity > 0
         rotation: root.rotation
 
@@ -520,15 +530,15 @@
 
         Image {
             anchors {
-                left: parent.left
-                leftMargin: (quickList.item.width - units.gu(1)) / 2 - width / 2
+                right: parent.left
+                rightMargin: -units.dp(4)
                 verticalCenter: parent.verticalCenter
-                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
+                verticalCenterOffset: -quickList.offset * (root.inverted ? 1 : -1)
             }
             height: units.gu(1)
             width: units.gu(2)
             source: "graphics/quicklist_tooltip.png"
-            rotation: (quickList.offset > 0 ? 0 : 180) + (root.inverted ? 0 : 180)
+            rotation: root.inverted ? 90 : 270
         }
 
         InverseMouseArea {
@@ -544,18 +554,18 @@
     Rectangle {
         id: quickList
         objectName: "quickList"
-        color: "#f5f5f5"
+        color: "#221e1c"
         // Because we're setting left/right anchors depending on orientation, it will break the
         // width setting after rotating twice. This makes sure we also re-apply width on rotation
         width: root.inverted ? units.gu(30) : units.gu(30)
         height: quickListColumn.height
         visible: quickListShape.visible
         anchors {
-            left: root.inverted ? undefined : parent.left
-            right: root.inverted ? parent.right : undefined
+            left: root.inverted ? undefined : parent.right
+            right: root.inverted ? parent.left : undefined
             margins: units.gu(1)
         }
-        y: itemCenter + offset
+        y: itemCenter - (height / 2) + offset
         rotation: root.rotation
 
         property var model
@@ -564,9 +574,8 @@
 
         // internal
         property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
-        property int offset: itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
-                                 -(item.height/2) - height - units.gu(.5) :
-                                 (item.height/2) + units.gu(.5)
+        property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
+                             itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
 
         Column {
             id: quickListColumn
@@ -585,7 +594,7 @@
                     // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
                     // ListItems don't know that they are sitting in a themed Popover where the color
                     // needs to be inverted.
-                    __foregroundColor: "black"
+                    __foregroundColor: theme.palette.selected.backgroundText
 
                     onClicked: {
                         if (!model.clickable) {

=== modified file 'src/MouseTouchAdaptor.cpp'
--- src/MouseTouchAdaptor.cpp	2015-03-02 12:41:17 +0000
+++ src/MouseTouchAdaptor.cpp	2015-06-18 11:46:46 +0000
@@ -104,10 +104,10 @@
     if (button != Qt::LeftButton)
         return true;
 
-    QPoint windowPos(pressEvent->event_x, pressEvent->event_y);
-
     QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
 
+    QPoint windowPos(pressEvent->event_x / targetWindow->devicePixelRatio(), pressEvent->event_y / targetWindow->devicePixelRatio());
+
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
     touchEvent.press(0 /* touchId */, windowPos);
@@ -125,10 +125,10 @@
     if (button != Qt::LeftButton)
         return true;
 
-    QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);
-
     QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
 
+    QPoint windowPos(releaseEvent->event_x / targetWindow->devicePixelRatio(), releaseEvent->event_y / targetWindow->devicePixelRatio());
+
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
     touchEvent.release(0 /* touchId */, windowPos);
@@ -144,10 +144,10 @@
         return true;
     }
 
-    QPoint windowPos(event->event_x, event->event_y);
-
     QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
 
+    QPoint windowPos(event->event_x / targetWindow->devicePixelRatio(), event->event_y / targetWindow->devicePixelRatio());
+
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
     touchEvent.move(0 /* touchId */, windowPos);

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2014-09-03 13:30:52 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2015-06-18 11:46:46 +0000
@@ -39,7 +39,10 @@
     m_focused(false),
     m_quickList(new MockQuickListModel(this))
 {
+}
 
+MockLauncherItem::~MockLauncherItem()
+{
 }
 
 QString MockLauncherItem::appId() const

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-04-30 09:31:51 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-06-18 11:46:46 +0000
@@ -31,6 +31,7 @@
     Q_OBJECT
 public:
     MockLauncherItem(const QString &appId, const QString& desktopFile, const QString& name, const QString& icon, QObject* parent = 0);
+    ~MockLauncherItem();
 
     QString appId() const override;
     QString desktopFile() const;

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-03-06 04:44:11 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-06-18 11:46:46 +0000
@@ -43,6 +43,7 @@
     item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
     item->setCount(1);
     item->setCountVisible(true);
+    item->setRunning(true);
     m_list.append(item);
     item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);
     item->setCount(12);
@@ -174,7 +175,9 @@
     int index = findApp(appId);
     if (index >= 0) {
         beginRemoveRows(QModelIndex(), index, 0);
-        m_list.takeAt(index)->deleteLater();
+        MockLauncherItem * item = m_list.takeAt(index);
+        item->setRunning(false);
+        item->deleteLater();
         endRemoveRows();
     }
 }

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-06-12 16:07:43 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-06-18 11:46:46 +0000
@@ -68,6 +68,7 @@
     Q_OBJECT
 public:
     MockAppManager(QObject *parent = 0): ApplicationManagerInterface(parent) {}
+    ~MockAppManager() {}
     int rowCount(const QModelIndex &) const override { return m_list.count(); }
     QVariant data(const QModelIndex &, int ) const override { return QVariant(); }
     QString focusedApplicationId() const override {
@@ -325,6 +326,46 @@
         QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));
     }
 
+    void testQuitMenuItem() {
+        // we have 2 apps running, both should have the Quit action in its quick list
+        QCOMPARE(launcherModel->rowCount(), 2);
+
+        // stop the second one keeping it pinned so that it doesn't go away
+        launcherModel->pin("no-icon");
+        appManager->stopApplication("no-icon");
+
+        // find the first Quit item, should be there
+        QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());
+        int quitActionIndex = -1;
+        for (int i = 0; i < model->rowCount(); ++i) {
+            if (model->get(i).actionId() == "stop_item") {
+                quitActionIndex = i;
+                break;
+            }
+        }
+        QVERIFY(quitActionIndex >= 0);
+
+        // find the second Quit item, should NOT be there, the app is stopped
+        QuickListModel *model2 = qobject_cast<QuickListModel*>(launcherModel->get(1)->quickList());
+        int quitActionIndex2 = -1;
+        for (int i = 0; i < model2->rowCount(); ++i) {
+            if (model2->get(i).actionId() == "stop_item") {
+                quitActionIndex2 = i;
+                break;
+            }
+        }
+        QVERIFY(quitActionIndex2 == -1);
+
+        // trigger the first quit item quicklist action
+        launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), quitActionIndex);
+        // first app should be gone...
+        QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
+        // ... the second app (now at index 0) should still be there, pinned and stopped
+        QCOMPARE(launcherModel->get(0)->appId(), QStringLiteral("no-icon"));
+        QCOMPARE(launcherModel->get(0)->pinned(), true);
+        QCOMPARE(launcherModel->get(0)->running(), false);
+    }
+
     void testGetUrlForAppId() {
         QCOMPARE(launcherModel->getUrlForAppId(QString()), QString());
         QCOMPARE(launcherModel->getUrlForAppId(""), QString());

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-04-24 09:53:37 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-06-18 11:46:46 +0000
@@ -146,7 +146,7 @@
                        startX+units.gu(8), startY);
 
             var panel = findChild(launcher, "launcherPanel");
-            verify(panel != undefined);
+            verify(!!panel);
 
             // wait until it gets fully extended
             tryCompare(panel, "x", 0);
@@ -157,7 +157,7 @@
             mouseMove(root, 1, root.height / 2);
 
             var panel = findChild(launcher, "launcherPanel");
-            verify(panel != undefined);
+            verify(!!panel);
 
             // wait until it gets fully extended
             tryCompare(panel, "x", 0);
@@ -187,7 +187,7 @@
             waitUntilLauncherDisappears();
 
             var panel = findChild(launcher, "launcherPanel")
-            verify(panel != undefined)
+            verify(!!panel)
 
             // it starts out hidden just left of the left launcher edge
             compare(panel.x, -panel.width)
@@ -225,7 +225,7 @@
 
             var appIcon = findChild(launcher, "launcherDelegate0");
 
-            verify(appIcon != undefined);
+            verify(!!appIcon);
 
             if (data.mouse) {
                 mouseClick(appIcon);
@@ -248,7 +248,7 @@
             dragLauncherIntoView()
 
             var dashIcon = findChild(launcher, "dashItem")
-            verify(dashIcon != undefined)
+            verify(!!dashIcon)
 
             mouseClick(dashIcon)
 
@@ -538,7 +538,7 @@
 
             // Doing longpress
             mousePress(draggedItem);
-            tryCompare(quickListShape, "opacity", 0.96);
+            tryCompare(quickListShape, "opacity", 0.8);
             mouseRelease(draggedItem);
 
             verify(quickList.y >= units.gu(1));
@@ -623,9 +623,31 @@
             tryCompare(quickList, "state", "");
         }
 
+        function test_quickListMenuOnRMB() {
+            dragLauncherIntoView();
+            var clickedItem = findChild(launcher, "launcherDelegate5")
+            var quickList = findChild(launcher, "quickList")
+            var quickListShape = findChild(launcher, "quickListShape")
+            var dndArea = findChild(launcher, "dndArea");
+
+            // Initial state
+            tryCompare(quickListShape, "visible", false)
+
+            // Doing RMB click
+            mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)
+            tryCompare(quickListShape, "visible", true)
+            verify(quickList, "state", "open")
+            verify(dndArea, "dragging", false)
+
+            // Click somewhere in the empty space to dismiss the quicklist
+            mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
+            tryCompare(quickListShape, "visible", false);
+            verify(quickList, "state", "")
+        }
+
         function test_revealByHover() {
             var panel = findChild(launcher, "launcherPanel");
-            verify(panel != undefined);
+            verify(!!panel);
 
             revealByHover();
             tryCompare(launcher, "state", "visibleTemporary");