Merge lp://qastaging/~unity-team/unity/unity.dash-to-preview into lp://qastaging/unity
Status: | Merged |
---|---|
Approved by: | Neil J. Patel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2719 |
Proposed branch: | lp://qastaging/~unity-team/unity/unity.dash-to-preview |
Merge into: | lp://qastaging/unity |
Diff against target: |
1553 lines (+738/-155) 23 files modified
dash/CoverflowResultView.cpp (+16/-2) dash/DashView.cpp (+355/-17) dash/DashView.h (+28/-1) dash/FilterAllButton.cpp (+4/-0) dash/FilterBar.cpp (+5/-10) dash/FilterBasicButton.cpp (+21/-8) dash/FilterBasicButton.h (+2/-0) dash/FilterExpanderLabel.cpp (+48/-15) dash/FilterMultiRangeButton.cpp (+7/-0) dash/FilterRatingsButton.cpp (+7/-0) dash/LensBar.cpp (+34/-17) dash/LensBarIcon.cpp (+7/-7) dash/LensView.cpp (+1/-2) dash/PlacesGroup.cpp (+25/-36) dash/ResultViewGrid.cpp (+36/-2) dash/previews/PreviewContainer.cpp (+2/-2) manual-tests/DashToPreviewTransition.txt (+38/-0) plugins/unityshell/src/unityshell.cpp (+15/-7) plugins/unityshell/src/unityshell.h (+3/-3) unity-shared/DashStyle.h (+2/-0) unity-shared/PlacesVScrollBar.cpp (+16/-9) unity-shared/SearchBar.cpp (+64/-15) unity-shared/UBusMessages.h (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/unity.dash-to-preview |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Neil J. Patel (community) | Approve | ||
Review via email: mp+124664@code.qastaging.launchpad.net |
Commit message
This branch introduces dash to preview transitions. I relies on this nux branch: https:/
Animation from Dash to Preview slides out elements of the dash to make room for the previews. The process happens in 250ms.
Many changes were necessary to create this effects. It has to be said that the changes have an impact on the rendering engine and the way elements are drawn in the dash. Efforts are being made to reduce this impact.
Description of the change
This branch introduces dash to preview transitions. I relies on this nux branch: https:/
Animation from Dash to Preview slides out elements of the dash to make room for the previews. The process happens in 250ms.
Many changes were necessary to create this effects. It has to be said that the changes have an impact on the rendering engine and the way elements are drawn in the dash. Efforts are being made to reduce this impact.
Hey, looks good and works well, have been using it for about a week.
Some comments:
- You've added an 'i' to the UBusMessages.h but forgot to add what it's for :)
- Please remove the commented out code:
//tick_ source_ .reset( new nux::NuxTimerTi ckSource) ; controller_ .reset( new na::AnimationCo ntroller( *tick_source_ ));
//animation_
// nux::GetGraphic sDisplay( )->GetGraphicsE ngine() ->QRP_GetCopyTe xture( >GetWidth( ), src_texture- >GetHeight( ),
// src_texture-
// layout_copy_, src_texture,
// texxform, nux::color::White);
//layout_ ->SetCopyPrevio usFboTexture( false);
//(opening_row_y_ - layout_ ->GetY( ))/(float) layout_ ->GetHeight( );
//SetCopyPrevio usFboTexture( false);
//SetRedirectRe nderingToTextur e(true) ; usFboTexture( false);
//SetCopyPrevio
// if (RedirectedAnce stor()) alpha_blend; src_blend_ factor; dest_blend_ factor; GetRenderStates ().GetBlend( current_ alpha_blend, current_ src_blend_ factor, current_ dest_blend_ factor) ;
// {
// // This is necessary when doing redirected rendering. Clean the area below this view.
// unsigned int current_
// unsigned int current_
// unsigned int current_
// GfxContext.
// GfxContext. GetRenderStates ().SetBlend( false); QRP_Color( GetX(), GetY(), GetWidth(), GetHeight(), nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
// GfxContext.
// GfxContext. GetRenderStates ().SetBlend( current_ alpha_blend, current_ src_blend_ factor, current_ dest_blend_ factor) ;
// }
// tick_source_ .tick(g_ get_monotonic_ time()) ;
// nux::animation: :TickSource tick_source_; :AnimationContr oller animation_ controller_ ;
// nux::animation: