Unity 8

Merge lp:~mzanetti/unity8/launcher-small-tweaks into lp:unity8

  1. launcher-small-tweaks
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: 466
Merged at revision: 537
Proposed branch: lp:~mzanetti/unity8/launcher-small-tweaks
Merge into: lp:unity8
Diff against target: 24 lines (+2/-1)
2 files modified
Launcher/LauncherDelegate.qml (+1/-0)
Launcher/LauncherPanel.qml (+1/-1)
To merge this branch: bzr merge lp:~mzanetti/unity8/launcher-small-tweaks
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Omer Akram (community) Approve
Andrea Cimitan Pending
Review via email: mp+191380@code.launchpad.net

Commit message

small launcher tweaks

* fix fakeDragItem's initial position to match with real item
* remove UbuntuShape's border glow

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/unity8-ci/1423/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5049
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2987/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2291/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1423
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1422
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/924
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2989
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2989/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2495/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2539/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1423/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

Looks good to me.

review: Approve
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/700/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/86
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/86/console
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/699
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/753/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3380
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1470

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/714/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/3258
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/832
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/820/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/292/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/100
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/832
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/832/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/820
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/820/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3428/console
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1517

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/719/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/3273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/842
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/830/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/105
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/105
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/842
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/830/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3436/console
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1525

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Launcher/LauncherDelegate.qml'
2--- Launcher/LauncherDelegate.qml 2013-09-04 22:44:01 +0000
3+++ Launcher/LauncherDelegate.qml 2013-10-16 11:35:17 +0000
4@@ -57,6 +57,7 @@
5 anchors.fill: parent
6 anchors.margins: units.gu(1)
7 radius: "medium"
8+ borderSource: "none"
9
10 image: Image {
11 id: iconImage
12
13=== modified file 'Launcher/LauncherPanel.qml'
14--- Launcher/LauncherPanel.qml 2013-09-11 15:33:02 +0000
15+++ Launcher/LauncherPanel.qml 2013-10-16 11:35:17 +0000
16@@ -368,7 +368,7 @@
17 var yOffset = draggedIndex > 0 ? (mouseY + launcherListView.realContentY) % (draggedIndex * launcherListView.realItemHeight) : mouseY + launcherListView.realContentY
18
19 fakeDragItem.iconName = launcherListView.model.get(draggedIndex).icon
20- fakeDragItem.x = 0
21+ fakeDragItem.x = units.gu(0.5)
22 fakeDragItem.y = mouseY - yOffset + launcherListView.anchors.topMargin + launcherListView.topMargin
23 fakeDragItem.angle = selectedItem.angle * (root.inverted ? -1 : 1)
24 fakeDragItem.offset = selectedItem.offset * (root.inverted ? -1 : 1)

Subscribers

People subscribed via source and target branches