| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/gtk/slide_animator_gtk.h" | 5 #include "chrome/browser/gtk/slide_animator_gtk.h" |
| 6 | 6 |
| 7 #include "app/animation.h" | 7 #include "app/animation.h" |
| 8 #include "app/slide_animation.h" | 8 #include "app/slide_animation.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 | 10 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 AnimationProgressed(animation_.get()); | 76 AnimationProgressed(animation_.get()); |
| 77 } else { | 77 } else { |
| 78 fixed_needs_resize_ = true; | 78 fixed_needs_resize_ = true; |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 | 81 |
| 82 void SlideAnimatorGtk::Close() { | 82 void SlideAnimatorGtk::Close() { |
| 83 animation_->Hide(); | 83 animation_->Hide(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void SlideAnimatorGtk::End() { |
| 87 animation_->End(); |
| 88 } |
| 89 |
| 86 void SlideAnimatorGtk::CloseWithoutAnimation() { | 90 void SlideAnimatorGtk::CloseWithoutAnimation() { |
| 87 animation_->Reset(0.0); | 91 animation_->Reset(0.0); |
| 88 animation_->Hide(); | 92 animation_->Hide(); |
| 89 AnimationProgressed(animation_.get()); | 93 AnimationProgressed(animation_.get()); |
| 90 gtk_widget_hide(widget_.get()); | 94 gtk_widget_hide(widget_.get()); |
| 91 } | 95 } |
| 92 | 96 |
| 93 bool SlideAnimatorGtk::IsShowing() { | 97 bool SlideAnimatorGtk::IsShowing() { |
| 94 return animation_->IsShowing(); | 98 return animation_->IsShowing(); |
| 95 } | 99 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 123 if (slider->child_needs_move_) { | 127 if (slider->child_needs_move_) { |
| 124 gtk_fixed_move(GTK_FIXED(slider->widget()), child, 0, -allocation->height); | 128 gtk_fixed_move(GTK_FIXED(slider->widget()), child, 0, -allocation->height); |
| 125 slider->child_needs_move_ = false; | 129 slider->child_needs_move_ = false; |
| 126 } | 130 } |
| 127 | 131 |
| 128 if (slider->fixed_needs_resize_) { | 132 if (slider->fixed_needs_resize_) { |
| 129 slider->AnimationProgressed(slider->animation_.get()); | 133 slider->AnimationProgressed(slider->animation_.get()); |
| 130 slider->fixed_needs_resize_ = false; | 134 slider->fixed_needs_resize_ = false; |
| 131 } | 135 } |
| 132 } | 136 } |
| OLD | NEW |