Merge lp:~josharenson/unity8/fix-scope-managment-scrolling into lp:unity8
- fix-scope-managment-scrolling
- Merge into trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~josharenson/unity8/fix-scope-managment-scrolling |
Merge into: | lp:unity8 |
Prerequisite: | lp:~aacid/unity8/scopes_shell_mock_lazy_load |
Diff against target: |
520 lines (+311/-52) 10 files modified
qml/Components/Autoscroller.qml (+164/-0) qml/Dash/Dash.qml (+1/-1) qml/Dash/DashPageHeader.qml (+1/-1) qml/Dash/ScopesList.qml (+103/-37) qml/Dash/ScopesListCategory.qml (+2/-0) qml/Dash/ScopesListCategoryItem.qml (+22/-8) tests/mocks/Unity/fake_scopes.cpp (+7/-0) tests/qmltests/Dash/tst_Dash.qml (+7/-1) tests/qmltests/Dash/tst_DashContent.qml (+3/-3) tests/qmltests/Dash/tst_DashShell.qml (+1/-1) |
To merge this branch: | bzr merge lp:~josharenson/unity8/fix-scope-managment-scrolling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Andrea Cimitan (community) | Needs Information | ||
Albert Astals Cid (community) | Needs Information | ||
Josh Arenson | Abstain | ||
Review via email: mp+296574@code.launchpad.net |
This proposal supersedes a proposal from 2016-06-04.
Commit message
Enable the scopes management list to auto-scroll when dragging and dropping scopes
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, clean
* 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, there probably should be on this...
Also fixes a bunch of warnings.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2405
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
The progressiveScro
How possible it is to extract them and have only one so that possible bugs/fixes to either one ends up in the other?
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2406
https:/
Executed test runs:
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2407
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
3 conflicts encountered.
Josh Arenson (josharenson) wrote : Posted in a previous version of this proposal | # |
This still needs some work as tests are failing, but the functionality is complete and using a genericized autoscroller.
Josh Arenson (josharenson) wrote : Posted in a previous version of this proposal | # |
testDashShell fails sometimes because the new model, which adds 20 extra scopes, is really slowing things down (it takes upwards of 10 seconds to load the dash on my machine). I profiled this and there isn't really an easy solution to improve performance that I could see.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2449
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2446
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2447
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2448
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2444. By Josh Arenson
-
mostly fix bzr stuff
Andrea Cimitan (cimi) wrote : | # |
autoscroller.qml is missing header!
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2444
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2445. By Josh Arenson
-
Merge prereq
- 2446. By Josh Arenson
-
Add license
Albert Astals Cid (aacid) wrote : | # |
Some small nitpicks
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2446
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2446
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2447. By Josh Arenson
-
Fix whitespace
- 2448. By Josh Arenson
-
Make if statement better
- 2449. By Josh Arenson
-
Make layout check more robust
Andrea Cimitan (cimi) wrote : | # |
Some comments for now (I need to test it), plus please merge https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2449
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2450. By Josh Arenson
-
Change maxStep to maximumStep
- 2451. By Josh Arenson
-
Fix review stuff
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2451
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
3 conflicts encountered.
- 2452. By Josh Arenson
-
Update scope count
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2452
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2452
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Josh Arenson (josharenson) 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.
Not since last push. Will top level approve pending next CI run
Josh Arenson (josharenson) wrote : | # |
Must have had some wrong window magic going on ^^^
- 2453. By Josh Arenson
-
update test
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2453
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
What do we need
property alias animationProperty: d.relevantConte
Behavior on animationProperty { UbuntuNumberAni
for? As far as I can see they are not used anywhere, no?
Albert Astals Cid (aacid) wrote : | # |
Do you think that updating the position of the dragged item inside the list is doable? I think it would make more sense if it did.
Josh Arenson (josharenson) wrote : | # |
> What do we need
>
> property alias animationProperty: d.relevantConte
> Behavior on animationProperty { UbuntuNumberAni
>
> for? As far as I can see they are not used anywhere, no?
I moved this into the private object as it appears you can't "Behave" on an alias. I also added a property to the API to allow the user to enable/disable the animation as it causes _horrible_ lag for small interval values (which makes sense as its doing an animation calculation every 2ms). In fact, I wonder if there is any point in having an interval < 16ms?
> Do you think that updating the position of the dragged item inside the list is
> doable? I think it would make more sense if it did.
I'll talk to you on IRC about this.. It seems like too strong of a coupling, but perhaps I'm misunderstanding.
- 2454. By Josh Arenson
-
Fix smoothing animation
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2454
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
Two things while you're at it:
- can we tune the flick velocity/
- the clip: true of the Flickable can be tweaked and removed in few cases, when the panel is shown it doesn't seem to do anything from a quick testing, but if you are scrolling a bit then press "back" then you see the listitems on the dash while the panel is hiding, maybe we can tweak things a little or use clip: true just when contentY is more than 0 and the panel is currently closing
Andrea Cimitan (cimi) wrote : | # |
that seems to be the case where we want clip to be true, otherwise false http://
- 2455. By Josh Arenson
-
Merge trunk
- 2456. By Josh Arenson
-
Disable clipping unless necessary
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2456
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
> + // Reset to false each time the list is opened. See header.
> + clip: !visible
it seems like as soon as you click back for the first time this binding will no longer work, probably you want ta different approach on onBackClicked or reset the clip on onVisibleChanged inside the flickable?
Also, remember the flickable speed!
- 2457. By Josh Arenson
-
Merge trunk
- 2458. By Josh Arenson
-
Fix clipping/binding issue
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2458
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
> onClipChanged: console.
oooops :)
can you also set something like
maximumFlic
flickDecele
inside flickable?
- 2459. By Josh Arenson
-
Remove debug statement
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2459
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
This fixes the dragItem not moving on autoscroll for me http://
The reason is that dragItem.y is only updated by QtQuick on mouse move and moving the flickable is not a mouse move so we need to give it a hand.
- 2460. By Josh Arenson
-
Fix mouse dragging not working quite right.
Thanks to aacid for this patch
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2460
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
small bits, and can you rebase on flick-speed-tuning please?
Andrea Cimitan (cimi) wrote : | # |
IIRC I tested and sometimes the list was like freezing - I'd put on hold this branch for now or someone can test it as well
- 2461. By Josh Arenson
-
merge trunk
- 2462. By Josh Arenson
-
Hack before cleanup
- 2463. By Josh Arenson
-
Fix dash overscrolling
- 2464. By Josh Arenson
-
Merge trunk
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2464
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
Hi Josh, thanks for trying :) The situation seems to be better, but it still hangs for me if you play with it, drag quickly or while scrolling
- 2465. By Josh Arenson
-
Fix end of list jitter
Josh Arenson (josharenson) wrote : | # |
Fixed the jittery issue that albert discovered. Still working to fix the issue that cimi mentioned.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2465
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2466. By Josh Arenson
-
Fix a small bug
- 2467. By Josh Arenson
-
Handle switching directions of the drag item w/o releasing
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2467
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2468. By Josh Arenson
-
merge trunk
- 2469. By Josh Arenson
-
Change timer values to make a bit more sense
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2469
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2470. By Josh Arenson
-
Merge trunk
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2470
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
We still have some overlflow issues while dragging to the bottom
- 2471. By Josh Arenson
-
Undo needless bug fix
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2471
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2471
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unmerged revisions
- 2471. By Josh Arenson
-
Undo needless bug fix
- 2470. By Josh Arenson
-
Merge trunk
- 2469. By Josh Arenson
-
Change timer values to make a bit more sense
- 2468. By Josh Arenson
-
merge trunk
- 2467. By Josh Arenson
-
Handle switching directions of the drag item w/o releasing
- 2466. By Josh Arenson
-
Fix a small bug
- 2465. By Josh Arenson
-
Fix end of list jitter
- 2464. By Josh Arenson
-
Merge trunk
- 2463. By Josh Arenson
-
Fix dash overscrolling
- 2462. By Josh Arenson
-
Hack before cleanup
Preview Diff
1 | === added file 'qml/Components/Autoscroller.qml' |
2 | --- qml/Components/Autoscroller.qml 1970-01-01 00:00:00 +0000 |
3 | +++ qml/Components/Autoscroller.qml 2016-10-18 14:03:36 +0000 |
4 | @@ -0,0 +1,164 @@ |
5 | +/* |
6 | + * Copyright (C) 2016 Canonical, Ltd. |
7 | + * |
8 | + * This program is free software; you can redistribute it and/or modify |
9 | + * it under the terms of the GNU General Public License as published by |
10 | + * the Free Software Foundation; version 3. |
11 | + * |
12 | + * This program is distributed in the hope that it will be useful, |
13 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | + * GNU General Public License for more details. |
16 | + * |
17 | + * You should have received a copy of the GNU General Public License |
18 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | + */ |
20 | + |
21 | +import QtQuick 2.4 |
22 | +import Ubuntu.Components 1.3 |
23 | + |
24 | +Item { |
25 | + id: root |
26 | + |
27 | + property bool enabled: false |
28 | + property bool horizontal: false |
29 | + |
30 | + // Uses an animation to smooth scrolling. |
31 | + // This is useful for a large delay/step, but with smaller |
32 | + // values it creates too much lag and should be disabled. |
33 | + // The default value of 2dp/2ms ensures an update for every event loop |
34 | + // and an animation can't smooth that anyway. |
35 | + property bool smoothScrolling: false |
36 | + property bool variableVelocity: true |
37 | + property int delay: 32 // ms delay between scrolls |
38 | + property real areaLength: units.gu(5) |
39 | + property real maximumStep: units.dp(2) |
40 | + property Flickable flickable |
41 | + |
42 | + function startScrolling(positiveDirection) { |
43 | + progressiveScrollingTimer.scrollPositiveDirection = positiveDirection; |
44 | + progressiveScrollingTimer.start(); |
45 | + } |
46 | + |
47 | + function stopScrolling() { |
48 | + progressiveScrollingTimer.stop(); |
49 | + } |
50 | + |
51 | + /* If enabled, increase step size based on pointer location |
52 | + * This makes scrolling change speed depending on how close the pointer |
53 | + * is to the upper/lower limit |
54 | + */ |
55 | + function stepSize() { |
56 | + if (!root.variableVelocity) return root.maximumStep; |
57 | + var step; |
58 | + if (!progressiveScrollingTimer.scrollPositiveDirection) { |
59 | + var delta; |
60 | + delta = d.relevantMouseAxis - d.lowerLimit; |
61 | + delta = delta / root.areaLength; |
62 | + step = Math.abs(delta) * root.maximumStep; |
63 | + } else { |
64 | + delta = d.relevantMouseAxis - d.upperLimit; |
65 | + delta = delta / root.areaLength; |
66 | + step = Math.abs(delta) * root.maximumStep; |
67 | + } |
68 | + |
69 | + return Math.ceil(step); |
70 | + } |
71 | + |
72 | + QtObject { |
73 | + id: d |
74 | + |
75 | + readonly property bool atRelevantContentAxisBeginning: root.horizontal ? |
76 | + root.flickable.atXBeginning : root.flickable.atYBeginning |
77 | + |
78 | + readonly property bool atRelevantContentAxisEnd: root.horizontal ? |
79 | + root.flickable.atXEnd : root.flickable.atYEnd |
80 | + |
81 | + // lower and upper are in terms of raw coordinates and not top/bottom of a list |
82 | + readonly property real lowerLimit: root.areaLength |
83 | + readonly property real upperLimit: { |
84 | + if (root.horizontal) { |
85 | + return (root.flickable.visibleArea.widthRatio * |
86 | + root.flickable.contentWidth) - root.areaLength; |
87 | + } else { |
88 | + return (root.flickable.visibleArea.heightRatio * |
89 | + root.flickable.contentHeight) - root.areaLength; |
90 | + } |
91 | + } |
92 | + |
93 | + property real relevantContentAxis |
94 | + property real relevantMouseAxis |
95 | + |
96 | + Behavior on relevantContentAxis { |
97 | + animation: UbuntuNumberAnimation{} |
98 | + enabled: root.smoothScrolling |
99 | + } |
100 | + } |
101 | + |
102 | + Timer { |
103 | + id: progressiveScrollingTimer |
104 | + |
105 | + property bool scrollPositiveDirection: true |
106 | + readonly property real listEnd: { |
107 | + if (root.horizontal) { |
108 | + return Math.floor((1 - root.flickable.visibleArea.widthRatio) * |
109 | + root.flickable.contentWidth); |
110 | + } else { |
111 | + return Math.floor((1 - root.flickable.visibleArea.heightRatio) * |
112 | + root.flickable.contentHeight); |
113 | + } |
114 | + } |
115 | + interval: root.delay |
116 | + repeat: true |
117 | + running: false |
118 | + |
119 | + onTriggered: { |
120 | + if (!scrollPositiveDirection && !d.atRelevantContentAxisBeginning) { |
121 | + if (d.relevantContentAxis > root.stepSize()) { |
122 | + d.relevantContentAxis -= root.stepSize(); |
123 | + } else { |
124 | + d.relevantContentAxis = 0; |
125 | + stopScrolling(); |
126 | + } |
127 | + } else if (scrollPositiveDirection && !d.atRelevantContentAxisEnd) { |
128 | + if (listEnd - d.relevantContentAxis > root.stepSize()) { |
129 | + d.relevantContentAxis += root.stepSize(); |
130 | + } else { |
131 | + d.relevantContentAxis = listEnd; |
132 | + stopScrolling(); |
133 | + } |
134 | + } |
135 | + } |
136 | + } |
137 | + |
138 | + Binding { |
139 | + target: root.flickable |
140 | + property: root.horizontal ? "contentX" : "contentY" |
141 | + value: d.relevantContentAxis |
142 | + } |
143 | + |
144 | + Mouse.onPositionChanged: { |
145 | + if (!root.enabled) return; |
146 | + |
147 | + // This synchronizes the bindings as scrolling from the middle of the list |
148 | + // can sometimes break |
149 | + if (root.horizontal) d.relevantContentAxis = root.flickable.contentX |
150 | + else d.relevantContentAxis = root.flickable.contentY |
151 | + |
152 | + d.relevantMouseAxis = (root.horizontal ? mouse.x : mouse.y) |
153 | + if (d.relevantMouseAxis < d.lowerLimit && !d.atRelevantContentAxisBeginning) { |
154 | + startScrolling(false); |
155 | + mouse.accepted = true; |
156 | + } else if (d.relevantMouseAxis >= d.upperLimit && !d.atRelevantContentAxisEnd) { |
157 | + startScrolling(true); |
158 | + mouse.accepted = true; |
159 | + } else { |
160 | + stopScrolling(); |
161 | + } |
162 | + } |
163 | + |
164 | + Mouse.onReleased: { |
165 | + stopScrolling(); |
166 | + mouse.accepted = root.enabled |
167 | + } |
168 | +} |
169 | |
170 | === modified file 'qml/Dash/Dash.qml' |
171 | --- qml/Dash/Dash.qml 2016-05-02 07:57:07 +0000 |
172 | +++ qml/Dash/Dash.qml 2016-10-18 14:03:36 +0000 |
173 | @@ -36,7 +36,7 @@ |
174 | } |
175 | } |
176 | |
177 | - property bool windowActive: window.active |
178 | + property bool windowActive: typeof(window) !== "undefined" ? window.active : false |
179 | property bool showOverlayScope: false |
180 | |
181 | DashCommunicatorService { |
182 | |
183 | === modified file 'qml/Dash/DashPageHeader.qml' |
184 | --- qml/Dash/DashPageHeader.qml 2016-08-16 14:06:26 +0000 |
185 | +++ qml/Dash/DashPageHeader.qml 2016-10-18 14:03:36 +0000 |
186 | @@ -81,7 +81,7 @@ |
187 | } |
188 | |
189 | function closePopup(keepFocus, keepSearch) { |
190 | - if (extraPanel.visible) { |
191 | + if (extraPanel && extraPanel.visible) { |
192 | extraPanel.visible = false; |
193 | } |
194 | if (!keepFocus) { |
195 | |
196 | === modified file 'qml/Dash/ScopesList.qml' |
197 | --- qml/Dash/ScopesList.qml 2016-07-27 16:23:18 +0000 |
198 | +++ qml/Dash/ScopesList.qml 2016-10-18 14:03:36 +0000 |
199 | @@ -66,6 +66,9 @@ |
200 | if (backIsClose) { |
201 | root.state = "browse" |
202 | } else { |
203 | + if (flickable.contentY > 0) { |
204 | + flickable.clip = true; |
205 | + } |
206 | root.backClicked() |
207 | } |
208 | } |
209 | @@ -73,50 +76,113 @@ |
210 | z: 1 |
211 | } |
212 | |
213 | - Flickable { |
214 | - objectName: "scopesListFlickable" |
215 | + Autoscroller { |
216 | + id: autoscroller |
217 | + objectName: "scopesListAutoscroller" |
218 | + |
219 | anchors { |
220 | top: header.bottom |
221 | bottom: parent.bottom |
222 | left: parent.left |
223 | right: parent.right |
224 | } |
225 | - clip: true |
226 | - contentWidth: root.width |
227 | - contentHeight: column.height |
228 | - onContentHeightChanged: returnToBounds(); |
229 | - Column { |
230 | - id: column |
231 | - Repeater { |
232 | - model: scope ? scope.categories : null |
233 | - |
234 | - delegate: Loader { |
235 | - asynchronous: true |
236 | - width: root.width |
237 | - active: results.count > 0 |
238 | - visible: active |
239 | - sourceComponent: ScopesListCategory { |
240 | - objectName: "scopesListCategory" + categoryId |
241 | - |
242 | - model: results |
243 | - |
244 | - title: { |
245 | - if (isFavoritesFeed) return i18n.tr("Home"); |
246 | - else if (isAlsoInstalled) return i18n.tr("Also installed"); |
247 | - else return name; |
248 | + |
249 | + enabled: root.state === "edit" |
250 | + flickable: flickable |
251 | + |
252 | + Flickable { |
253 | + id: flickable |
254 | + objectName: "scopesListFlickable" |
255 | + |
256 | + anchors.fill: parent |
257 | + |
258 | + // Reset to false each time the list is opened. See header.onBackClicked |
259 | + onVisibleChanged: clip = !visible |
260 | + contentWidth: root.width |
261 | + contentHeight: column.height |
262 | + onContentHeightChanged: returnToBounds(); |
263 | + Column { |
264 | + id: column |
265 | + Repeater { |
266 | + model: scope ? scope.categories : null |
267 | + |
268 | + delegate: Loader { |
269 | + asynchronous: true |
270 | + width: root.width |
271 | + active: results.count > 0 |
272 | + visible: active |
273 | + sourceComponent: ScopesListCategory { |
274 | + objectName: "scopesListCategory" + categoryId |
275 | + |
276 | + Mouse.forwardTo: [autoscroller] |
277 | + model: results |
278 | + title: { |
279 | + if (isFavoritesFeed) return i18n.tr("Home"); |
280 | + else if (isAlsoInstalled) return i18n.tr("Also installed"); |
281 | + else return name; |
282 | + } |
283 | + |
284 | + editMode: root.state === "edit" |
285 | + |
286 | + scopeStyle: root.scopeStyle |
287 | + isFavoritesFeed: categoryId == "favorites" |
288 | + isAlsoInstalled: categoryId == "other" |
289 | + |
290 | + onRequestFavorite: root.requestFavorite(scopeId, favorite); |
291 | + onRequestEditMode: root.state = "edit"; |
292 | + onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index); |
293 | + onRequestActivate: root.scope.activate(result, categoryId); |
294 | + onRequestRestore: root.requestRestore(scopeId); |
295 | + |
296 | + readonly property var contentYChangedTarget: isFavoritesFeed && dragItem.visible ? flickable : null |
297 | + property double flickableContentYDrag: 0 |
298 | + onContentYChangedTargetChanged: { |
299 | + if (contentYChangedTarget) { |
300 | + flickableContentYDrag = flickable.contentY |
301 | + } |
302 | + } |
303 | + |
304 | + |
305 | + // Since tracking the drag item can change the flickable |
306 | + // size, this "kill switch" prevents overscrolling locally. |
307 | + // The Autoscroller should take care of everything else. |
308 | + property bool hasBeenReleased: true |
309 | + property bool overscrolling: false |
310 | + |
311 | + Mouse.onReleased: { |
312 | + hasBeenReleased = true; |
313 | + overscrolling = false; |
314 | + } |
315 | + |
316 | + Mouse.onPressed: hasBeenReleased = false; |
317 | + |
318 | + Connections { |
319 | + target: flickable |
320 | + onAtYEndChanged: { |
321 | + if (flickable.atYEnd && !hasBeenReleased) { |
322 | + overscrolling = true; |
323 | + } |
324 | + } |
325 | + } |
326 | + |
327 | + property int lastYPos: -1 |
328 | + Connections { |
329 | + target: contentYChangedTarget |
330 | + onContentYChanged: { |
331 | + // Can't scroll past the bottom if the dragItem is |
332 | + // now scrolling towards the top |
333 | + if (flickable.contentY < lastYPos) { |
334 | + overscrolling = false; |
335 | + } else if (overscrolling) { |
336 | + return; |
337 | + } |
338 | + |
339 | + dragItem.y += (flickable.contentY - flickableContentYDrag); |
340 | + flickableContentYDrag = flickable.contentY |
341 | + lastYPos = flickable.contentY |
342 | + } |
343 | + } |
344 | } |
345 | - |
346 | - editMode: root.state == "edit" |
347 | - |
348 | - scopeStyle: root.scopeStyle |
349 | - isFavoritesFeed: categoryId == "favorites" |
350 | - isAlsoInstalled: categoryId == "other" |
351 | - |
352 | - onRequestFavorite: root.requestFavorite(scopeId, favorite); |
353 | - onRequestEditMode: root.state = "edit"; |
354 | - onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index); |
355 | - onRequestActivate: root.scope.activate(result, categoryId); |
356 | - onRequestRestore: root.requestRestore(scopeId); |
357 | } |
358 | } |
359 | } |
360 | |
361 | === modified file 'qml/Dash/ScopesListCategory.qml' |
362 | --- qml/Dash/ScopesListCategory.qml 2016-07-27 16:23:18 +0000 |
363 | +++ qml/Dash/ScopesListCategory.qml 2016-10-18 14:03:36 +0000 |
364 | @@ -29,6 +29,7 @@ |
365 | property bool editMode: false |
366 | property bool isFavoritesFeed: false |
367 | property bool isAlsoInstalled: false |
368 | + readonly property alias dragItem: dragItem |
369 | |
370 | visible: !editMode || isFavoritesFeed |
371 | |
372 | @@ -93,6 +94,7 @@ |
373 | |
374 | hideChildren: dragItem.loaderToShrink == loader |
375 | |
376 | + Mouse.forwardTo: [root] |
377 | onClicked: { |
378 | if (!editMode) { |
379 | if (root.isFavoritesFeed) |
380 | |
381 | === modified file 'qml/Dash/ScopesListCategoryItem.qml' |
382 | --- qml/Dash/ScopesListCategoryItem.qml 2016-03-09 14:14:59 +0000 |
383 | +++ qml/Dash/ScopesListCategoryItem.qml 2016-10-18 14:03:36 +0000 |
384 | @@ -84,19 +84,33 @@ |
385 | visible: text != "" |
386 | } |
387 | } |
388 | - AbstractButton { |
389 | + Item { |
390 | id: starArea |
391 | objectName: "starArea" |
392 | height: parent.height |
393 | width: height |
394 | anchors.right: parent.right |
395 | - onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite); |
396 | - onPressedChanged: { |
397 | - if (editMode) { |
398 | - if (pressed) root.handlePressed(starArea.__mouseArea); |
399 | - else root.handleReleased(starArea.__mouseArea); |
400 | - } |
401 | - } |
402 | + |
403 | + MouseArea { |
404 | + id: mouseArea |
405 | + anchors.fill: parent |
406 | + Mouse.forwardTo:[starArea] |
407 | + } |
408 | + |
409 | + Mouse.forwardTo: [root] |
410 | + Mouse.onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite); |
411 | + Mouse.onPressed: { |
412 | + if (editMode) { |
413 | + root.handlePressed(mouseArea); |
414 | + } |
415 | + } |
416 | + |
417 | + Mouse.onReleased: { |
418 | + if (editMode) { |
419 | + root.handleReleased(mouseArea); |
420 | + } |
421 | + } |
422 | + |
423 | visible: editMode || showStar |
424 | Icon { |
425 | id: star |
426 | |
427 | === modified file 'tests/mocks/Unity/fake_scopes.cpp' |
428 | --- tests/mocks/Unity/fake_scopes.cpp 2016-06-07 03:33:35 +0000 |
429 | +++ tests/mocks/Unity/fake_scopes.cpp 2016-10-18 14:03:36 +0000 |
430 | @@ -73,6 +73,13 @@ |
431 | addScope(longNavigationScope); |
432 | |
433 | addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true)); |
434 | + |
435 | + // Add enough scopes to test autoscrolling on the scopes managment page |
436 | + for (int i = 0; i < 20; i++) { |
437 | + addScope(new Scope("UselessScope" + QString::number(i), |
438 | + "US" + QString::number(i), true, this)); |
439 | + } |
440 | + |
441 | m_scopesOverview = new ScopesOverview(this); |
442 | |
443 | if (!m_loaded) { |
444 | |
445 | === modified file 'tests/qmltests/Dash/tst_Dash.qml' |
446 | --- tests/qmltests/Dash/tst_Dash.qml 2016-09-22 07:41:49 +0000 |
447 | +++ tests/qmltests/Dash/tst_Dash.qml 2016-10-18 14:03:36 +0000 |
448 | @@ -58,7 +58,7 @@ |
449 | tryCompare(dashContentList, "count", 0); |
450 | scopes.load(); |
451 | tryCompare(dashContentList, "currentIndex", 0); |
452 | - tryCompare(dashContentList, "count", 8); |
453 | + tryCompare(dashContentList, "count", 28); |
454 | tryCompare(scopes, "loaded", true); |
455 | tryCompareFunction(function() { |
456 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
457 | @@ -253,6 +253,9 @@ |
458 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
459 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
460 | |
461 | + // Ensure non favorites are visible |
462 | + flickToYEnd(findChild(dash,"scopesListFlickable")); |
463 | + |
464 | // Click on a non favorite scope |
465 | mouseClick(nonfavScopesListCategoryList.currentItem); |
466 | |
467 | @@ -502,6 +505,9 @@ |
468 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
469 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
470 | |
471 | + // Ensure non favorite scopes are visible |
472 | + flickToYEnd(findChild(dash, "scopesListFlickable")); |
473 | + |
474 | // Click on a non favorite scope |
475 | mouseClick(nonfavScopesListCategoryList.currentItem); |
476 | |
477 | |
478 | === modified file 'tests/qmltests/Dash/tst_DashContent.qml' |
479 | --- tests/qmltests/Dash/tst_DashContent.qml 2016-08-30 09:33:01 +0000 |
480 | +++ tests/qmltests/Dash/tst_DashContent.qml 2016-10-18 14:03:36 +0000 |
481 | @@ -70,7 +70,7 @@ |
482 | function loadScopes() { |
483 | scopeLoadedSpy.clear(); |
484 | scopesModel.load(); |
485 | - tryCompare(scopeLoadedSpy, "count", 8, 15000); |
486 | + tryCompare(scopeLoadedSpy, "count", 28, 15000); |
487 | tryCompare(scopesModel, "loaded", true); |
488 | tryCompareFunction(function() { |
489 | var mockScope1Loader = findChild(shell, "scopeLoader0"); |
490 | @@ -124,7 +124,7 @@ |
491 | |
492 | loadScopes(); |
493 | |
494 | - compare(dashContentList.count, 8); |
495 | + compare(dashContentList.count, 28); |
496 | verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count); |
497 | } |
498 | |
499 | @@ -181,7 +181,7 @@ |
500 | |
501 | // test greater than scope count. |
502 | var currentScopeIndex = dashContent.currentIndex; |
503 | - dashContent.setCurrentScopeAtIndex(18, true, false); |
504 | + dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false); |
505 | compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count"); |
506 | } |
507 | |
508 | |
509 | === modified file 'tests/qmltests/Dash/tst_DashShell.qml' |
510 | --- tests/qmltests/Dash/tst_DashShell.qml 2016-07-08 20:44:09 +0000 |
511 | +++ tests/qmltests/Dash/tst_DashShell.qml 2016-10-18 14:03:36 +0000 |
512 | @@ -60,7 +60,7 @@ |
513 | tryCompare(dashContentList, "count", 0); |
514 | scopes.load(); |
515 | tryCompare(dashContentList, "currentIndex", 0); |
516 | - tryCompare(dashContentList, "count", 8); |
517 | + tryCompare(dashContentList, "count", 28); |
518 | tryCompare(scopes, "loaded", true); |
519 | tryCompareFunction(function() { |
520 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
FAILED: Continuous integration, rev:2400 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1232/ /unity8- jenkins. ubuntu. com/job/ build-0- fetch/1658 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1609 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 1609 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1602/console
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1232/ rebuild
https:/