Merge lp://qastaging/~gordallott/unity/fade-dash-icons into lp://qastaging/~mhr3/unity/coalescing-icon-loader
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~gordallott/unity/fade-dash-icons |
| Merge into: | lp://qastaging/~mhr3/unity/coalescing-icon-loader |
| Diff against target: |
6319 lines (+3229/-1256) 74 files modified
HACKING (+7/-0) UnityCore/CMakeLists.txt (+2/-0) UnityCore/Categories.cpp (+8/-0) UnityCore/Categories.h (+1/-0) UnityCore/Filters.cpp (+8/-0) UnityCore/Filters.h (+1/-0) UnityCore/GLibDBusProxy.cpp (+11/-0) UnityCore/GLibDBusProxy.h (+1/-0) UnityCore/GLibWrapper.cpp (+5/-0) UnityCore/GLibWrapper.h (+1/-0) UnityCore/HomeLens.cpp (+957/-0) UnityCore/HomeLens.h (+79/-0) UnityCore/Lens.cpp (+128/-55) UnityCore/Lens.h (+17/-6) UnityCore/Model-inl.h (+47/-9) UnityCore/Model.h (+11/-0) UnityCore/Results.cpp (+8/-0) UnityCore/Results.h (+1/-0) com.canonical.Unity.gschema.xml (+10/-3) manual-tests/AutoMaximize.txt (+19/-0) manual-tests/Dash.txt (+15/-0) manual-tests/SuperTab.txt (+22/-0) plugins/unityshell/resources/dash-widgets.json (+2/-2) plugins/unityshell/src/BamfLauncherIcon.cpp (+2/-2) plugins/unityshell/src/BamfLauncherIcon.h (+2/-2) plugins/unityshell/src/DashSearchBar.cpp (+8/-4) plugins/unityshell/src/DashView.cpp (+41/-9) plugins/unityshell/src/DashView.h (+4/-2) plugins/unityshell/src/FavoriteStore.h (+5/-5) plugins/unityshell/src/FavoriteStoreGSettings.cpp (+41/-14) plugins/unityshell/src/FavoriteStoreGSettings.h (+2/-1) plugins/unityshell/src/FavoriteStorePrivate.cpp (+130/-0) plugins/unityshell/src/FavoriteStorePrivate.h (+47/-0) plugins/unityshell/src/FilterBar.cpp (+30/-2) plugins/unityshell/src/FilterBasicButton.cpp (+10/-3) plugins/unityshell/src/FilterExpanderLabel.cpp (+39/-14) plugins/unityshell/src/FilterExpanderLabel.h (+5/-1) plugins/unityshell/src/FilterGenreWidget.cpp (+2/-10) plugins/unityshell/src/FilterMultiRangeWidget.cpp (+1/-9) plugins/unityshell/src/FilterRatingsWidget.cpp (+1/-1) plugins/unityshell/src/HomeView.cpp (+0/-252) plugins/unityshell/src/HomeView.h (+0/-93) plugins/unityshell/src/IMTextEntry.cpp (+39/-29) plugins/unityshell/src/IMTextEntry.h (+5/-4) plugins/unityshell/src/LauncherController.cpp (+85/-0) plugins/unityshell/src/LauncherModel.cpp (+30/-0) plugins/unityshell/src/LauncherModel.h (+1/-0) plugins/unityshell/src/LensBar.cpp (+13/-3) plugins/unityshell/src/LensView.cpp (+11/-2) plugins/unityshell/src/PlacesGroup.cpp (+7/-4) plugins/unityshell/src/PlacesHomeView.cpp (+0/-378) plugins/unityshell/src/PlacesHomeView.h (+0/-72) plugins/unityshell/src/PluginAdapter.cpp (+7/-0) plugins/unityshell/src/ResultRenderer.cpp (+2/-1) plugins/unityshell/src/ResultRenderer.h (+1/-1) plugins/unityshell/src/ResultRendererHorizontalTile.cpp (+31/-4) plugins/unityshell/src/ResultRendererHorizontalTile.h (+1/-1) plugins/unityshell/src/ResultRendererTile.cpp (+36/-6) plugins/unityshell/src/ResultRendererTile.h (+4/-1) plugins/unityshell/src/ResultViewGrid.cpp (+33/-3) plugins/unityshell/src/ShortcutController.cpp (+52/-34) plugins/unityshell/src/ShortcutController.h (+10/-5) plugins/unityshell/src/unityshell.cpp (+39/-52) plugins/unityshell/src/unityshell.h (+5/-6) po/POTFILES.in (+0/-1) po/unity.pot (+0/-120) services/panel-service.c (+2/-2) standalone-clients/CMakeLists.txt (+0/-4) standalone-clients/standalone_dash.cpp (+0/-16) tests/CMakeLists.txt (+10/-6) tests/test_favorite_store_gsettings.cpp (+268/-2) tests/test_favorite_store_private.cpp (+417/-0) tests/test_home_lens.cpp (+362/-0) tests/test_utils.h (+27/-0) |
| To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/fade-dash-icons |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michal Hruby | Pending | ||
|
Review via email:
|
|||
Description of the change
Fades in dash icons when they are loaded, requires the collated results branch
will only fade in icons that take > one frame to load, based on the idea that fading in items that load quickly is
annoying, wheras fading in items that take a while to load is an appology for taking so long to load.
Unmerged revisions
- 1877. By Gord Allott
-
premultiply the draw colour
- 1876. By Gord Allott
-
reduce fadeout, fix blending issue
- 1875. By Gord Allott
-
Merge in collated renderering branch, update for horizontal tiles
- 1874. By Gord Allott
-
removed debugs
- 1873. By Gord Allott
-
first shot at a fading icon renderer
- 1872. By Mirco Müller
-
Remaining issues for LP: #863246 (and also LP: #863240) fixed.
See example screenshots of the after-state here:
http://people. canonical. com/~mmueller/ fix-863246- 863240- 1.png
http://people. canonical. com/~mmueller/ fix-863246- 863240- 2.png
http://people. canonical. com/~mmueller/ fix-863246- 863240- 3.png
http://people. canonical. com/~mmueller/ fix-863246- 863240- 4.png Alignments, margins, colors, opacities, artwork fixed for buttons, separators, outlines, text and expander-arrows.
One glitch remaining is the separator-rendering being too thick/missing occasionally (on some systems). A solution for fixing this, is available. It's reverted in this branch, as some blending issues with this remain. But that can be added afterwards, to avoid all the other fixes being blocked on just that.. Fixes: https:/
/bugs.launchpad .net/bugs/ 863246. Appoved by Andrea Azzarone, Andrea Cimitan. - 1871. By Andrea Azzarone
-
Add FavoriteStore external change support.. Fixes: https:/
/bugs.launchpad .net/bugs/ 681503. Appoved by Mirco Müller. - 1870. By Marco Trevisan (Treviño)
-
Add support to middle-click pasting on the dash search bar.
When the XA_PRIMARY clipboard has some content, that is pasted by middle click over the dash search bar.
This is for consistency with the rest of the system.I've also added the proper glib::Object support to the class.. Fixes: https:/
/bugs.launchpad .net/bugs/ 842462. Appoved by Mirco Müller, Andrea Azzarone. - 1869. By Andrea Azzarone
-
Window auto-maximise functionality should be disabled on monitors with a resolution above 1024 x 600.. Fixes: https:/
/bugs.launchpad .net/bugs/ 797808. Appoved by Mirco Müller, Marco Biscaro. - 1868. By Mikkel Kamstrup Erlandsen
-
Replace the Unity home screen tiles with a "merged lens view" where lenses can contribute any categories they see fit.
settings: introduced a new gsettings key in the com.canonical.
Unity.Dash namespace that controls the order of the results on the home screen. We should consider in a later branch having the sorting logic in FilesystemLenses also use this key (still falling back to alphabetical sorting when nothing is set). It empowers users and OEMs to override the default view on the homescreen by putting custom stuff first. libunity-core: Added a HomeLens class that implements Lens and Lenses interfaces. The typical use case is to add a FilesystemLenses to the HomeLens which will make it automatically merge all lenses found on the fs. In testing we implement custom Lenses instances and add those to the HomeLens in stead.
unityshell: Removed the tiled homescreen and use a bog standard LensView to render the HomeLens in stead. Fixed a bunch of places where we assumed that Lenses' categories were always only appended to. This is no longer true with the HomeLens. Also important: Fix the SetViewType() calling semantics to the lenses when showing/hiding the dash and when switching between the lenses.
Testing it out:
For this branch to work you need also: lp:~kamstrup/unity-lens-applications/home-lenses, lp:~kamstrup/unity-lens-files/home-lenses, and lp:~mhr3/unity-lens-music/home-lenses. Add to that latest bamf. Without these you will not see the correct results.To validate the results: Make sure that bringing up the dash resets the search and shows you a default view with exactly 3 categories in this order: Recent Apps, Recent Files, and Downloads. Then do a search and validate that you have exactly 3 categories in this order Applications, Files & Folders, and Music.
Finally; launch an app that is not a favorite, then bring up the bring up the dash home screen and assert that the running app is *not* in the recent apps category (but showing in the launcher). Then close the app and bring up the dash again. The app should now show under Recent Apps.
Design review:
Home screen without search: https://bugs.launchpad .net/unity/ +bug/885738/ +attachment/ 2690636/ +files/ unity-home- lens-design- review- 1.png
Home screen with search: https://bugs.launchpad .net/unity/ +bug/885738/ +attachment/ 2690639/ +files/ unity-home- lens-design- review- 2.png. Fixes: https:/ /bugs.launchpad .net/bugs/ 885738, https:/ /bugs.launchpad .net/bugs/ 914759. Appoved by Michal Hruby.
