lp://staging/~unity-team/unity8/rtm-20150108
- Get this branch:
- bzr branch lp://staging/~unity-team/unity8/rtm-20150108
Branch merges
- Michał Sawicz: Approve
-
Diff: 1539 lines (+708/-143)43 files modifieddebian/changelog (+18/-0)
debian/control (+0/-1)
plugins/Dash/CMakeLists.txt (+3/-2)
plugins/Dash/CardCreator.js (+8/-10)
plugins/Dash/CroppedImageMinimumSourceSize.qml (+25/-19)
plugins/Dash/abstractdashview.cpp (+24/-5)
plugins/Dash/abstractdashview.h (+6/-0)
plugins/Dash/croppedimagesizer.cpp (+136/-0)
plugins/Dash/croppedimagesizer.h (+72/-0)
plugins/Dash/croppedimagesizerasyncworker.cpp (+74/-0)
plugins/Dash/croppedimagesizerasyncworker.h (+47/-0)
plugins/Dash/listviewwithpageheader.cpp (+7/-2)
plugins/Dash/listviewwithpageheader.h (+4/-4)
plugins/Dash/plugin.cpp (+2/-0)
qml/Components/ResponsiveVerticalJournal.qml (+1/-0)
qml/Dash/CardCarousel.qml (+1/-0)
qml/Dash/CardGrid.qml (+1/-2)
qml/Dash/CardHorizontalList.qml (+1/-0)
qml/Dash/CardVerticalJournal.qml (+1/-1)
qml/Dash/DashContent.qml (+2/-0)
qml/Dash/DashRenderer.qml (+2/-4)
qml/Dash/GenericScopeView.qml (+75/-24)
qml/Dash/Previews/PreviewZoomableImage.qml (+1/-0)
qml/Dash/ScopeListView.qml (+4/-2)
qml/Greeter/Infographics.qml (+9/-7)
qml/Shell.qml (+20/-2)
tests/autopilot/unity8/shell/emulators/dash.py (+1/-1)
tests/plugins/Dash/CMakeLists.txt (+1/-0)
tests/plugins/Dash/cardcreator/1.res (+4/-4)
tests/plugins/Dash/cardcreator/2.res (+2/-3)
tests/plugins/Dash/cardcreator/3.res (+10/-10)
tests/plugins/Dash/cardcreator/4.res (+3/-4)
tests/plugins/Dash/cardcreator/5.res (+10/-10)
tests/plugins/Dash/cardcreator/7.res (+2/-3)
tests/plugins/Dash/horizontaljournaltest.qml (+1/-0)
tests/plugins/Dash/listviewwithpageheadertest.cpp (+1/-1)
tests/plugins/Dash/organicgridtest.qml (+1/-0)
tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml (+56/-0)
tests/plugins/Dash/verticaljournaltest.qml (+1/-0)
tests/qmltests/Dash/tst_Card.qml (+0/-22)
tests/qmltests/Dash/tst_DashContent.qml (+57/-0)
tests/qmltests/Dash/tst_GenericScopeView.qml (+2/-0)
tests/utils/modules/Unity/Test/UnityTestCase.qml (+12/-0)
Related bugs
Bug #1383277: Power dialog shown on resume with big backgrounds or high load | Medium | Fix Released | |
Bug #1384393: Photos in scope not visible until all loaded | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 1417. By Albert Astals Cid
-
Make sure changing a scope doesn't trigger creation/
destruction of delegates until it's finished - 1415. By Michał Sawicz
-
Don't block handling power events on loading the greeter's qml and the background image.
During power button press, we call greeter.showNow(), which was taking so long to return that we couldn't handle the power button release for a few seconds. Which meant that the shutdown dialog thought it would be a good time to appear.
The easiest fix is to delay calling showNow until after we finish handling the event.
Approved by: Daniel d'Andrada, PS Jenkins bot - 1414. By Albert Astals Cid
-
Rework how we set the ranges so we get some more asynchronousity from item views
Approved by: Andrea Cimitan - 1413. By Albert Astals Cid
-
Make CroppedImageSizer async
QImageReader can block waiting on disk I/O so let's not have it on the main thread.
CroppedImageSiz
erAsyncWorker is using a QFuture via QtConcurrent::run to get a thread and do the work. CroppedImageSiz erAsyncWorker is created by CroppedImageSizer but deletes itself, either when the work has been finished or when it's aborted by CroppedImageSizer. This is why it's held with a QPointer in CroppedImageSizer.
Approved by: Michał Sawicz, Michael Zanetti - 1412. By Albert Astals Cid
-
Don't create the whole current scope delegates, just height * 3
Approved by: Andrea Cimitan - 1411. By Albert Astals Cid
-
Use QImageReader not to load the image into memory twice
Approved by: Michał Sawicz
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/unity8