Unity 8

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

  1. workaround-broken-BorderImage
  2. Merge into trunk
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
=== modified file 'qml/Dash/PageHeaderExtraPanel.qml'
--- qml/Dash/PageHeaderExtraPanel.qml 2016-11-15 17:43:52 +0000
+++ qml/Dash/PageHeaderExtraPanel.qml 2017-03-09 12:55:35 +0000
@@ -50,7 +50,7 @@
50 rightMargin: -units.gu(1)50 rightMargin: -units.gu(1)
51 bottomMargin: -units.gu(1)51 bottomMargin: -units.gu(1)
52 }52 }
53 source: "graphics/rectangular_dropshadow.sci"53 Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
54 }54 }
5555
56 Rectangle {56 Rectangle {
5757
=== modified file 'qml/Greeter/LoginAreaContainer.qml'
--- qml/Greeter/LoginAreaContainer.qml 2016-09-13 12:25:30 +0000
+++ qml/Greeter/LoginAreaContainer.qml 2017-03-09 12:55:35 +0000
@@ -26,8 +26,8 @@
26 rightMargin: -units.gu(1.5)26 rightMargin: -units.gu(1.5)
27 bottomMargin: -units.gu(1.5)27 bottomMargin: -units.gu(1.5)
28 }28 }
29 source: "../graphics/dropshadow2gu.sci"
30 opacity: 0.3529 opacity: 0.35
30 Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
31 }31 }
3232
33 UbuntuShape {33 UbuntuShape {
3434
=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml 2016-09-13 12:25:30 +0000
+++ qml/Notifications/Notification.qml 2017-03-09 12:55:35 +0000
@@ -143,9 +143,9 @@
143 fill: contents143 fill: contents
144 margins: shapedBack.visible ? -units.gu(1) : -units.gu(1.5)144 margins: shapedBack.visible ? -units.gu(1) : -units.gu(1.5)
145 }145 }
146 source: "../graphics/dropshadow2gu.sci"
147 opacity: notification.opacity * 0.5146 opacity: notification.opacity * 0.5
148 enabled: !fullscreen147 enabled: !fullscreen
148 Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
149 }149 }
150150
151 UbuntuShape {151 UbuntuShape {
152152
=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml 2017-02-07 14:10:41 +0000
+++ qml/Panel/Panel.qml 2017-03-09 12:55:35 +0000
@@ -120,7 +120,7 @@
120 margins: -units.gu(1)120 margins: -units.gu(1)
121 }121 }
122 visible: !__indicators.fullyClosed122 visible: !__indicators.fullyClosed
123 source: "graphics/rectangular_dropshadow.sci"123 Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
124 }124 }
125125
126 BorderImage {126 BorderImage {
@@ -130,7 +130,7 @@
130 margins: -units.gu(1)130 margins: -units.gu(1)
131 }131 }
132 visible: !__applicationMenus.fullyClosed132 visible: !__applicationMenus.fullyClosed
133 source: "graphics/rectangular_dropshadow.sci"133 Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
134 }134 }
135135
136 BorderImage {136 BorderImage {
@@ -140,7 +140,7 @@
140 bottomMargin: -units.gu(1)140 bottomMargin: -units.gu(1)
141 }141 }
142 visible: PanelState.dropShadow142 visible: PanelState.dropShadow
143 source: "graphics/rectangular_dropshadow.sci"143 Component.onCompleted: source = "graphics/rectangular_dropshadow.sci"
144 }144 }
145145
146 Rectangle {146 Rectangle {
147147
=== modified file 'qml/Stage/ChildWindow.qml'
--- qml/Stage/ChildWindow.qml 2017-01-26 11:10:01 +0000
+++ qml/Stage/ChildWindow.qml 2017-03-09 12:55:35 +0000
@@ -80,8 +80,8 @@
80 left: parent.left; right: parent.right80 left: parent.left; right: parent.right
81 margins: -shadowThickness81 margins: -shadowThickness
82 }82 }
83 source: "../graphics/dropshadow2gu.sci"
84 opacity: .383 opacity: .3
84 Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
85 }85 }
8686
87 Loader {87 Loader {
8888
=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml 2017-01-26 11:10:01 +0000
+++ qml/Stage/DecoratedWindow.qml 2017-03-09 12:55:35 +0000
@@ -145,8 +145,8 @@
145 }145 }
146 height: Math.min(applicationWindow.implicitHeight, applicationWindow.height) * applicationWindow.itemScale146 height: Math.min(applicationWindow.implicitHeight, applicationWindow.height) * applicationWindow.itemScale
147 + root.decorationHeight * Math.min(1, root.showDecoration) + (active ? units.gu(4) : units.gu(3))147 + root.decorationHeight * Math.min(1, root.showDecoration) + (active ? units.gu(4) : units.gu(3))
148 source: "../graphics/dropshadow2gu.sci"
149 opacity: root.shadowOpacity148 opacity: root.shadowOpacity
149 Component.onCompleted: source = "../graphics/dropshadow2gu.sci"
150 }150 }
151151
152 ApplicationWindow {152 ApplicationWindow {

Subscribers

People subscribed via source and target branches