Merge lp://qastaging/~unity-team/unity/unity.dash-to-preview into lp://qastaging/unity

Proposed by Jay Taoko
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
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://code.launchpad.net/~unity-team/nux/nux.redirected-views/+merge/124661

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://code.launchpad.net/~unity-team/nux/nux.redirected-views/+merge/124661

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.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

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::NuxTimerTickSource);
//animation_controller_.reset(new na::AnimationController(*tick_source_));

// nux::GetGraphicsDisplay()->GetGraphicsEngine()->QRP_GetCopyTexture(
// src_texture->GetWidth(), src_texture->GetHeight(),
// layout_copy_, src_texture,
// texxform, nux::color::White);

//layout_->SetCopyPreviousFboTexture(false);

//(opening_row_y_ - layout_->GetY())/(float)layout_->GetHeight();

//SetCopyPreviousFboTexture(false);

//SetRedirectRenderingToTexture(true);
//SetCopyPreviousFboTexture(false);

// if (RedirectedAncestor())
// {
// // This is necessary when doing redirected rendering. Clean the area below this view.
// unsigned int current_alpha_blend;
// unsigned int current_src_blend_factor;
// unsigned int current_dest_blend_factor;
// GfxContext.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);

// GfxContext.GetRenderStates().SetBlend(false);
// GfxContext.QRP_Color(GetX(), GetY(), GetWidth(), GetHeight(), nux::Color(0.0f, 0.0f, 0.0f, 0.0f));

// 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_;
// nux::animation::AnimationController animation_controller_;

review: Needs Fixing
Revision history for this message
Neil J. Patel (njpatel) wrote :

Oh, please add the manual tests as discussed too, thanks.

Revision history for this message
Neil J. Patel (njpatel) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1340/console reported an error when processing this lp:~unity-team/unity/unity.dash-to-preview branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.