Supporting shrinking/enlarging for notifications

ui/message_center/views/toast_contents_view.cc

 // Copyright (c) 2013 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/message_center/views/toast_contents_view.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 59 matching lines @@
 ToastContentsView::~ToastContentsView() {
   if (collection_)
     collection_->ForgetToast(this);
 }
 
 void ToastContentsView::SetContents(MessageView* view,
                                     bool a11y_feedback_for_updates) {
   bool already_has_contents = child_count() > 0;
   RemoveAllChildViews(true);
   AddChildView(view);
-  preferred_size_ = GetToastSizeForView(view);
-  Layout();
+  UpdatePreferredSize();
 
   // If it has the contents already, this invocation means an update of the
   // popup toast, and the new contents should be read through a11y feature.
   // The notification type should be ALERT, otherwise the accessibility message
   // won't be read for this view which returns ROLE_WINDOW.
   if (already_has_contents && a11y_feedback_for_updates)
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, false);
 }
 
 void ToastContentsView::UpdateContents(const Notification& notification,
                                        bool a11y_feedback_for_updates) {
   DCHECK_GT(child_count(), 0);
   MessageView* message_view = static_cast<MessageView*>(child_at(0));
   message_view->UpdateWithNotification(notification);
-  gfx::Size new_size = GetToastSizeForView(message_view);
-  if (preferred_size_ != new_size) {
-    preferred_size_ = new_size;
-    Layout();
-  }
+  UpdatePreferredSize();
   if (a11y_feedback_for_updates)
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, false);
 }
 
 void ToastContentsView::RevealWithAnimation(gfx::Point origin) {
   // Place/move the toast widgets. Currently it stacks the widgets from the
   // right-bottom of the work area.
   // TODO(mukai): allow to specify the placement policy from outside of this
   // class. The policy should be specified from preference on Windows, or
   // the launcher alignment on ChromeOS.
   origin_ = gfx::Point(origin.x() - preferred_size_.width(),
                        origin.y() - preferred_size_.height());
 
   gfx::Rect stable_bounds(origin_, preferred_size_);
 
   SetBoundsInstantly(GetClosedToastBounds(stable_bounds));
   StartFadeIn();
   SetBoundsWithAnimation(stable_bounds);
 }
 
 void ToastContentsView::CloseWithAnimation() {
   if (is_closing_)
     return;
   is_closing_ = true;
   StartFadeOut();
 }
 
 void ToastContentsView::SetBoundsInstantly(gfx::Rect new_bounds) {
-  if (new_bounds == bounds())
+  DCHECK(new_bounds.size().width() <= preferred_size_.width() &&
+         new_bounds.size().height() <= preferred_size_.height())
+      << "we can not display widget bigger than notification";
+
+  if (!GetWidget())
+    return;
+
+  if (new_bounds == GetWidget()->GetWindowBoundsInScreen())
     return;
 
   origin_ = new_bounds.origin();
-  if (!GetWidget())
-    return;
   GetWidget()->SetBounds(new_bounds);
 }
 
 void ToastContentsView::SetBoundsWithAnimation(gfx::Rect new_bounds) {
-  if (new_bounds == bounds())
+  DCHECK(new_bounds.size().width() <= preferred_size_.width() &&
+         new_bounds.size().height() <= preferred_size_.height())
+      << "we can not display widget bigger than notification";
+
+  if (!GetWidget())
+    return;
+
+  if (new_bounds == animated_bounds_end_)
     return;
 
   origin_ = new_bounds.origin();
-  if (!GetWidget())
-    return;
-
   // This picks up the current bounds, so if there was a previous animation
   // half-done, the next one will pick up from the current location.
   // This is the only place that should query current location of the Widget
   // on screen, the rest should refer to the bounds_.
   animated_bounds_start_ = GetWidget()->GetWindowBoundsInScreen();
   animated_bounds_end_ = new_bounds;
 
   if (collection_)
     collection_->IncrementDeferCounter();
 
@@ skipping 125 matching lines @@
   if (child_count() > 0) {
     child_at(0)->SetBounds(
         0, 0, preferred_size_.width(), preferred_size_.height());
   }
 }
 
 gfx::Size ToastContentsView::GetPreferredSize() const {
   return child_count() ? GetToastSizeForView(child_at(0)) : gfx::Size();
 }
 
+void ToastContentsView::UpdatePreferredSize() {
+  DCHECK_GT(child_count(), 0);
+  gfx::Size new_size = GetToastSizeForView(child_at(0));
+  if (preferred_size_ == new_size)
+    return;
+  // Growing notifications instantly can cause notification's to overlap
+  // And shrinking with animation, leaves area, where nothing is drawn
+  const bool change_instantly = preferred_size_.width() > new_size.width() ||
+                                preferred_size_.height() > new_size.height();
+  preferred_size_ = new_size;
+  Layout();
+  if (change_instantly) {
+    SetBoundsInstantly(bounds());
+    return;
+  }
+  SetBoundsWithAnimation(bounds());
+}
+
 void ToastContentsView::GetAccessibleState(ui::AXViewState* state) {
   if (child_count() > 0)
     child_at(0)->GetAccessibleState(state);
   state->role = ui::AX_ROLE_WINDOW;
 }
 
 void ToastContentsView::ClickOnNotification(
     const std::string& notification_id) {
   if (collection_)
     collection_->ClickOnNotification(notification_id);
@@ skipping 57 matching lines @@
 }
 
 gfx::Rect ToastContentsView::GetClosedToastBounds(gfx::Rect bounds) {
   return gfx::Rect(bounds.x() + bounds.width() - kClosedToastWidth,
                    bounds.y(),
                    kClosedToastWidth,
                    bounds.height());
 }
 
 }  // namespace message_center