Experimental app list: Change transition animations of top-level pages.

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/contents_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 55 matching lines @@
   }
 
   apps_container_view_ = new AppsContainerView(app_list_main_view_, model);
 
   AddLauncherPage(
       apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS);
 
   int initial_page_index = app_list::switches::IsExperimentalAppListEnabled()
                                ? GetPageIndexForNamedPage(NAMED_PAGE_START)
                                : GetPageIndexForNamedPage(NAMED_PAGE_APPS);
+  DCHECK_GE(initial_page_index, 0);
 
   page_before_search_ = initial_page_index;
   pagination_model_.SelectPage(initial_page_index, false);
 
   // Needed to update the main search box visibility.
   ActivePageChanged(false);
 }
 
 void ContentsView::CancelDrag() {
   if (apps_container_view_->apps_grid_view()->has_dragged_view())
@@ skipping 25 matching lines @@
 
   SetActivePageInternal(page_index, false);
 }
 
 int ContentsView::GetActivePageIndex() const {
   // The active page is changed at the beginning of an animation, not the end.
   return pagination_model_.SelectedTargetPage();
 }
 
 bool ContentsView::IsNamedPageActive(NamedPage named_page) const {
-  std::map<NamedPage, int>::const_iterator it =
-      named_page_to_view_.find(named_page);
-  if (it == named_page_to_view_.end())
-    return false;
-  return it->second == GetActivePageIndex();
+  int active_page_index = GetActivePageIndex();
+  return active_page_index >= 0 &&
+         GetPageIndexForNamedPage(named_page) == active_page_index;
 }
 
 int ContentsView::GetPageIndexForNamedPage(NamedPage named_page) const {
   // Find the index of the view corresponding to the given named_page.
   std::map<NamedPage, int>::const_iterator it =
       named_page_to_view_.find(named_page);
-  // GetPageIndexForNamedPage should never be called on a named_page that does
-  // not have a corresponding view.
-  DCHECK(it != named_page_to_view_.end());
+  if (it == named_page_to_view_.end())
+    return -1;
+
   return it->second;
 }
 
 int ContentsView::NumLauncherPages() const {
   return pagination_model_.total_pages();
 }
 
 void ContentsView::SetActivePageInternal(int page_index,
                                          bool show_search_results) {
   if (!show_search_results)
@@ skipping 21 matching lines @@
 
   // Notify parent AppListMainView of the page change.
   app_list_main_view_->UpdateSearchBoxVisibility();
 }
 
 void ContentsView::ShowSearchResults(bool show) {
   int search_page = GetPageIndexForNamedPage(
       app_list::switches::IsExperimentalAppListEnabled()
           ? NAMED_PAGE_START
           : NAMED_PAGE_SEARCH_RESULTS);
+  DCHECK_GE(search_page, 0);
 
   SetActivePageInternal(show ? search_page : page_before_search_, show);
 }
 
 bool ContentsView::IsShowingSearchResults() const {
   return app_list::switches::IsExperimentalAppListEnabled()
              ? IsNamedPageActive(NAMED_PAGE_START) &&
                    start_page_view_->IsShowingSearchResults()
              : IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS);
 }
 
+gfx::Rect ContentsView::GetOffscreenPageBounds(int page_index) const {
+  gfx::Rect bounds(GetContentsBounds());
+  // The start page and search page origins are above; all other pages' origins
+  // are below.
+  int page_height = bounds.height();
+  bool origin_above =
+      GetPageIndexForNamedPage(NAMED_PAGE_START) == page_index ||
+      GetPageIndexForNamedPage(NAMED_PAGE_SEARCH_RESULTS) == page_index;
+  bounds.set_y(origin_above ? -page_height : page_height);
+  return bounds;
+}
+
 void ContentsView::UpdatePageBounds() {
-  gfx::Rect rect(GetContentsBounds());
-  if (rect.IsEmpty())
-    return;
-
   // The bounds calculations will potentially be mid-transition (depending on
   // the state of the PaginationModel).
   int current_page = std::max(0, pagination_model_.selected_page());
   int target_page = current_page;
   double progress = 1;
   if (pagination_model_.has_transition()) {
     const PaginationModel::Transition& transition =
         pagination_model_.transition();
     if (pagination_model_.is_valid_page(transition.target_page)) {
       target_page = transition.target_page;
       progress = transition.progress;
     }
   }
 
-  gfx::Rect incoming_target(rect);
-  gfx::Rect outgoing_target(rect);
-  int dir = target_page > current_page ? -1 : 1;
+  // Move |current_page| from 0 to its origin. Move |target_page| from its
+  // origin to 0.
+  gfx::Rect current_page_rect(GetOffscreenPageBounds(current_page));
+  gfx::Rect target_page_rect(GetOffscreenPageBounds(target_page));
+  current_page_rect.set_x(progress * current_page_rect.x());
+  current_page_rect.set_y(progress * current_page_rect.y());
+  target_page_rect.set_x((1 - progress) * target_page_rect.x());
+  target_page_rect.set_y((1 - progress) * target_page_rect.y());

[calamity, 2014/09/10 04:37:21]

Use gfx::RectValueBetween().

[Matt Giuca, 2014/09/10 04:53:33]

Done.

(Thanks, I was looking for something like this.)

 
-  // Pages transition vertically.
-  int page_height = rect.height();
-  int transition_offset = progress * page_height * dir;
-
-  outgoing_target.set_y(transition_offset);
-  incoming_target.set_y(dir < 0 ? transition_offset + page_height
-                                : transition_offset - page_height);
-
-  view_model_->view_at(current_page)->SetBoundsRect(outgoing_target);
-  view_model_->view_at(target_page)->SetBoundsRect(incoming_target);
+  view_model_->view_at(current_page)->SetBoundsRect(current_page_rect);
+  view_model_->view_at(target_page)->SetBoundsRect(target_page_rect);
 }
 
 PaginationModel* ContentsView::GetAppsPaginationModel() {
   return apps_container_view_->apps_grid_view()->pagination_model();
 }
 
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
   apps_container_view_->ShowActiveFolder(item);
 }
 
@@ skipping 70 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list