Merge lp:~lukas-kde/unity8/workaround-broken-BorderImage into lp:unity8

Proposed by Lukáš Tinkl
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~lukas-kde/unity8/workaround-broken-BorderImage
Merge into: lp:unity8
Diff against target: 100 lines (+8/-8)
6 files modified
qml/Dash/PageHeaderExtraPanel.qml (+1/-1)
qml/Greeter/LoginAreaContainer.qml (+1/-1)
qml/Notifications/Notification.qml (+1/-1)
qml/Panel/Panel.qml (+3/-3)
qml/Stage/ChildWindow.qml (+1/-1)
qml/Stage/DecoratedWindow.qml (+1/-1)
To merge this branch: bzr merge lp:~lukas-kde/unity8/workaround-broken-BorderImage
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+319446@code.launchpad.net

Commit message

Workaround broken BorderImage loading

Description of the change

Workaround broken BorderImage loading

"Fixes" bug lp:1671449

Most likely caused by https://code.launchpad.net/~aacid/ubuntu-ui-toolkit/save_stat_loading_already_loaded_image/+merge/316235

Not nice but proposing here in case we need a quick fix

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3321/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4371
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2616
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2616
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4399
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4232
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4232/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3321/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in qml/Stage/DecoratedWindow.qml
1 conflicts encountered.

Should we discard it in favour of the UITK fix? Is it supposed to be landing "really soon now"

Revision history for this message
Michał Sawicz (saviq) wrote :

Yeah UITK's under QA now: https://bileto.ubuntu.com/#/ticket/2647

review: Disapprove

Unmerged revisions

2841. By Lukáš Tinkl

workaround broken BorderImage loading

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/PageHeaderExtraPanel.qml'
2--- qml/Dash/PageHeaderExtraPanel.qml 2016-11-15 17:43:52 +0000
3+++ qml/Dash/PageHeaderExtraPanel.qml 2017-03-09 12:55:35 +0000
4@@ -50,7 +50,7 @@
5 rightMargin: -units.gu(1)
6 bottomMargin: -units.gu(1)
7 }
8- source: "graphics/rectangular_dropshadow.sci"
9+ Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
10 }
11
12 Rectangle {
13
14=== modified file 'qml/Greeter/LoginAreaContainer.qml'
15--- qml/Greeter/LoginAreaContainer.qml 2016-09-13 12:25:30 +0000
16+++ qml/Greeter/LoginAreaContainer.qml 2017-03-09 12:55:35 +0000
17@@ -26,8 +26,8 @@
18 rightMargin: -units.gu(1.5)
19 bottomMargin: -units.gu(1.5)
20 }
21- source: "../graphics/dropshadow2gu.sci"
22 opacity: 0.35
23+ Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
24 }
25
26 UbuntuShape {
27
28=== modified file 'qml/Notifications/Notification.qml'
29--- qml/Notifications/Notification.qml 2016-09-13 12:25:30 +0000
30+++ qml/Notifications/Notification.qml 2017-03-09 12:55:35 +0000
31@@ -143,9 +143,9 @@
32 fill: contents
33 margins: shapedBack.visible ? -units.gu(1) : -units.gu(1.5)
34 }
35- source: "../graphics/dropshadow2gu.sci"
36 opacity: notification.opacity * 0.5
37 enabled: !fullscreen
38+ Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
39 }
40
41 UbuntuShape {
42
43=== modified file 'qml/Panel/Panel.qml'
44--- qml/Panel/Panel.qml 2017-02-07 14:10:41 +0000
45+++ qml/Panel/Panel.qml 2017-03-09 12:55:35 +0000
46@@ -120,7 +120,7 @@
47 margins: -units.gu(1)
48 }
49 visible: !__indicators.fullyClosed
50- source: "graphics/rectangular_dropshadow.sci"
51+ Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
52 }
53
54 BorderImage {
55@@ -130,7 +130,7 @@
56 margins: -units.gu(1)
57 }
58 visible: !__applicationMenus.fullyClosed
59- source: "graphics/rectangular_dropshadow.sci"
60+ Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
61 }
62
63 BorderImage {
64@@ -140,7 +140,7 @@
65 bottomMargin: -units.gu(1)
66 }
67 visible: PanelState.dropShadow
68- source: "graphics/rectangular_dropshadow.sci"
69+ Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
70 }
71
72 Rectangle {
73
74=== modified file 'qml/Stage/ChildWindow.qml'
75--- qml/Stage/ChildWindow.qml 2017-01-26 11:10:01 +0000
76+++ qml/Stage/ChildWindow.qml 2017-03-09 12:55:35 +0000
77@@ -80,8 +80,8 @@
78 left: parent.left; right: parent.right
79 margins: -shadowThickness
80 }
81- source: "../graphics/dropshadow2gu.sci"
82 opacity: .3
83+ Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
84 }
85
86 Loader {
87
88=== modified file 'qml/Stage/DecoratedWindow.qml'
89--- qml/Stage/DecoratedWindow.qml 2017-01-26 11:10:01 +0000
90+++ qml/Stage/DecoratedWindow.qml 2017-03-09 12:55:35 +0000
91@@ -145,8 +145,8 @@
92 }
93 height: Math.min(applicationWindow.implicitHeight, applicationWindow.height) * applicationWindow.itemScale
94 + root.decorationHeight * Math.min(1, root.showDecoration) + (active ? units.gu(4) : units.gu(3))
95- source: "../graphics/dropshadow2gu.sci"
96 opacity: root.shadowOpacity
97+ Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
98 }
99
100 ApplicationWindow {

Subscribers

People subscribed via source and target branches