| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/tray/tray_item_view.h" | 5 #include "ash/system/tray/tray_item_view.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
| 9 #include "ash/wm/shelf_types.h" | 9 #include "ash/wm/shelf_types.h" |
| 10 #include "ui/base/animation/slide_animation.h" | 10 #include "ui/base/animation/slide_animation.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 static_cast<int>(size.width() * animation_->GetCurrentValue()))); | 88 static_cast<int>(size.width() * animation_->GetCurrentValue()))); |
| 89 return size; | 89 return size; |
| 90 } | 90 } |
| 91 | 91 |
| 92 void TrayItemView::ChildPreferredSizeChanged(views::View* child) { | 92 void TrayItemView::ChildPreferredSizeChanged(views::View* child) { |
| 93 PreferredSizeChanged(); | 93 PreferredSizeChanged(); |
| 94 } | 94 } |
| 95 | 95 |
| 96 void TrayItemView::AnimationProgressed(const ui::Animation* animation) { | 96 void TrayItemView::AnimationProgressed(const ui::Animation* animation) { |
| 97 gfx::Transform transform; | 97 gfx::Transform transform; |
| 98 transform.SetScale(animation->GetCurrentValue(), | 98 transform.Translate(0, animation->CurrentValueBetween( |
| 99 animation->GetCurrentValue()); | |
| 100 transform.ConcatTranslate(0, animation->CurrentValueBetween( | |
| 101 static_cast<double>(height()) / 2, 0.)); | 99 static_cast<double>(height()) / 2, 0.)); |
| 100 transform.Scale(animation->GetCurrentValue(), |
| 101 animation->GetCurrentValue()); |
| 102 layer()->SetTransform(transform); | 102 layer()->SetTransform(transform); |
| 103 PreferredSizeChanged(); | 103 PreferredSizeChanged(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 void TrayItemView::AnimationEnded(const ui::Animation* animation) { | 106 void TrayItemView::AnimationEnded(const ui::Animation* animation) { |
| 107 if (animation->GetCurrentValue() < 0.1) | 107 if (animation->GetCurrentValue() < 0.1) |
| 108 views::View::SetVisible(false); | 108 views::View::SetVisible(false); |
| 109 } | 109 } |
| 110 | 110 |
| 111 void TrayItemView::AnimationCanceled(const ui::Animation* animation) { | 111 void TrayItemView::AnimationCanceled(const ui::Animation* animation) { |
| 112 AnimationEnded(animation); | 112 AnimationEnded(animation); |
| 113 } | 113 } |
| 114 | 114 |
| 115 } // namespace internal | 115 } // namespace internal |
| 116 } // namespace ash | 116 } // namespace ash |
| OLD | NEW |