Unity 8

Merge lp:~nick-dedekind/unity8/indicator.dismissal into lp:unity8

  1. indicator.dismissal
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Michał Sawicz
Approved revision: 999
Merged at revision: 1056
Proposed branch: lp:~nick-dedekind/unity8/indicator.dismissal
Merge into: lp:unity8
Prerequisite: lp:~nick-dedekind/unity8/move-indicator-qml
Diff against target: 163 lines (+1/-49)
6 files modified
qml/Panel/Indicators.qml (+1/-0)
qml/Panel/Indicators/MenuItemFactory.qml (+0/-6)
qml/Panel/Indicators/MessageMenuItemFactory.qml (+0/-3)
qml/Panel/Panel.qml (+0/-22)
qml/Shell.qml (+0/-4)
tests/qmltests/Panel/tst_Panel.qml (+0/-14)
To merge this branch: bzr merge lp:~nick-dedekind/unity8/indicator.dismissal
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Albert Astals Cid (community) Needs Fixing
Review via email: mp+225338@code.launchpad.net

Commit message

Removed indicator menu dismissal on menu activation

Description of the change

 * 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?
Yes

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

8 + indicatorRow.currentItemOffset = 0;

bitsized bug I noticed while was changing this.

lp:~nick-dedekind/unity8/indicator.dismissal updated
998. By Nick Dedekind

removed explicit panel hiding

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/unity8-ci/3297/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1474
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/391
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9175

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

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

PASSED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/unity8-ci/3354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2653
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2653/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9392

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

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

Text conflict in qml/Panel/Panel.qml
1 conflicts encountered.

review: Needs Fixing
lp:~nick-dedekind/unity8/indicator.dismissal updated
999. By Nick Dedekind

merged with trunk

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> Text conflict in qml/Panel/Panel.qml
> 1 conflicts encountered.

Fixed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:999
http://jenkins.qa.ubuntu.com/job/unity8-ci/3387/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1801/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/481
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/481/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/481
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2064/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2882/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9619

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

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

 * Did CI run pass? If not, please explain why.
Unrelated Jenkins unhappiness.

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

FAILED: Continuous integration, rev:999
http://jenkins.qa.ubuntu.com/job/unity8-ci/3469/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/470/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3296/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Panel/Indicators.qml'
--- qml/Panel/Indicators.qml 2014-07-03 15:29:50 +0000
+++ qml/Panel/Indicators.qml 2014-07-10 13:39:07 +0000
@@ -262,6 +262,7 @@
262 indicators.calculateCurrentItem(touchX, false);262 indicators.calculateCurrentItem(touchX, false);
263 } else {263 } else {
264 indicators.state = "commit";264 indicators.state = "commit";
265 indicatorRow.currentItemOffset = 0;
265 }266 }
266 }267 }
267268
268269
=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml 2014-07-04 17:53:52 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml 2014-07-10 13:39:07 +0000
@@ -140,7 +140,6 @@
140140
141 onTriggered: {141 onTriggered: {
142 menuModel.activate(menuIndex);142 menuModel.activate(menuIndex);
143 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
144 }143 }
145 }144 }
146 }145 }
@@ -186,7 +185,6 @@
186185
187 onTriggered: {186 onTriggered: {
188 menuModel.activate(menuIndex);187 menuModel.activate(menuIndex);
189 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
190 }188 }
191 }189 }
192 }190 }
@@ -205,7 +203,6 @@
205203
206 onTriggered: {204 onTriggered: {
207 menuModel.activate(menuIndex);205 menuModel.activate(menuIndex);
208 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
209 }206 }
210 }207 }
211 }208 }
@@ -226,7 +223,6 @@
226223
227 onTriggered: {224 onTriggered: {
228 menuModel.activate(menuIndex);225 menuModel.activate(menuIndex);
229 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
230 }226 }
231 }227 }
232 }228 }
@@ -367,7 +363,6 @@
367 }363 }
368 onTriggered: {364 onTriggered: {
369 menuModel.activate(menuIndex);365 menuModel.activate(menuIndex);
370 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
371 }366 }
372367
373 function loadAttributes() {368 function loadAttributes() {
@@ -412,7 +407,6 @@
412 }407 }
413 onClicked: {408 onClicked: {
414 menuModel.activate(menuIndex, true);409 menuModel.activate(menuIndex, true);
415 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
416 }410 }
417 onDismissed: {411 onDismissed: {
418 menuModel.activate(menuIndex, false);412 menuModel.activate(menuIndex, false);
419413
=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
--- qml/Panel/Indicators/MessageMenuItemFactory.qml 2014-07-04 17:34:51 +0000
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml 2014-07-10 13:39:07 +0000
@@ -95,7 +95,6 @@
9595
96 onAppActivated: {96 onAppActivated: {
97 menuModel.activate(menuIndex, true);97 menuModel.activate(menuIndex, true);
98 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
99 }98 }
100 onDismissed: {99 onDismissed: {
101 menuModel.activate(menuIndex, false);100 menuModel.activate(menuIndex, false);
@@ -144,7 +143,6 @@
144143
145 onAppActivated: {144 onAppActivated: {
146 menuModel.activate(menuIndex, true);145 menuModel.activate(menuIndex, true);
147 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
148 }146 }
149 onDismissed: {147 onDismissed: {
150 menuModel.activate(menuIndex, false);148 menuModel.activate(menuIndex, false);
@@ -204,7 +202,6 @@
204202
205 onAppActivated: {203 onAppActivated: {
206 menuModel.activate(menuIndex, true);204 menuModel.activate(menuIndex, true);
207 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
208 }205 }
209 onDismissed: {206 onDismissed: {
210 menuModel.activate(menuIndex, false);207 menuModel.activate(menuIndex, false);
211208
=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml 2014-07-09 19:44:14 +0000
+++ qml/Panel/Panel.qml 2014-07-10 13:39:07 +0000
@@ -27,28 +27,6 @@
27 property alias callHint: __callHint27 property alias callHint: __callHint
28 property bool fullscreenMode: false28 property bool fullscreenMode: false
2929
30 function hideIndicatorMenu(delay) {
31 if (delay !== undefined) {
32 hideTimer.interval = delay;
33 hideTimer.start();
34 } else {
35 indicators.hide();
36 }
37 }
38
39 Timer {
40 id: hideTimer
41 running: false
42 onTriggered: {
43 indicators.hide();
44 }
45 }
46
47 Connections {
48 target: indicators
49 onShownChanged: hideTimer.stop()
50 }
51
52 Rectangle {30 Rectangle {
53 id: darkenedArea31 id: darkenedArea
54 property real darkenedOpacity: 0.632 property real darkenedOpacity: 0.6
5533
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml 2014-07-09 19:44:14 +0000
+++ qml/Shell.qml 2014-07-10 13:39:07 +0000
@@ -472,10 +472,6 @@
472 stages.hide()472 stages.hide()
473 }473 }
474474
475 function hideIndicatorMenu(delay) {
476 panel.hideIndicatorMenu(delay);
477 }
478
479 Item {475 Item {
480 id: overlay476 id: overlay
481477
482478
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml 2014-07-08 15:02:15 +0000
+++ tests/qmltests/Panel/tst_Panel.qml 2014-07-10 13:39:07 +0000
@@ -333,19 +333,5 @@
333333
334 compare(indicatorRow.currentItem, indicatorItemFirst, "First indicator should still be the current item");334 compare(indicatorRow.currentItem, indicatorItemFirst, "First indicator should still be the current item");
335 }335 }
336
337 function test_hideIndicatorMenu_data() {
338 return [ {tag: "no-delay", delay: undefined },
339 {tag: "delayed", delay: 200 }
340 ];
341 }
342
343 function test_hideIndicatorMenu(data) {
344 panel.indicators.show();
345 compare(panel.indicators.shown, true);
346
347 panel.hideIndicatorMenu(data.delay);
348 tryCompare(panel.indicators, "shown", false);
349 }
350 }336 }
351}337}

Subscribers

People subscribed via source and target branches