Chromium Code Reviews| 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 "ui/views/controls/throbber.h" | 5 #include "ui/views/controls/throbber.h" |
| 6 | 6 |
| 7 #include "base/time.h" | 7 #include "base/time.h" |
| 8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/gfx/canvas.h" | 10 #include "ui/gfx/canvas.h" |
| 11 #include "ui/gfx/image/image.h" | 11 #include "ui/gfx/image/image.h" |
| 12 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
| 13 | 13 |
| 14 using base::Time; | 14 using base::Time; |
| 15 using base::TimeDelta; | 15 using base::TimeDelta; |
| 16 | 16 |
| 17 namespace views { | 17 namespace views { |
| 18 | 18 |
| 19 Throbber::Throbber(int frame_time_ms, | 19 Throbber::Throbber(int frame_time_ms, |
| 20 bool paint_while_stopped) | 20 bool paint_while_stopped) |
| 21 : running_(false), | 21 : running_(false), |
| 22 paint_while_stopped_(paint_while_stopped), | 22 paint_while_stopped_(paint_while_stopped), |
| 23 frames_(NULL), | 23 frames_(NULL), |
| 24 frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)) { | 24 frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)), |
| 25 interactive_(true) { | |
| 25 SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed( | 26 SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| 26 IDR_THROBBER).ToImageSkia()); | 27 IDR_THROBBER).ToImageSkia()); |
| 27 } | 28 } |
| 28 | 29 |
| 29 Throbber::~Throbber() { | 30 Throbber::~Throbber() { |
| 30 Stop(); | 31 Stop(); |
| 31 } | 32 } |
| 32 | 33 |
| 33 void Throbber::Start() { | 34 void Throbber::Start() { |
| 34 if (running_) | 35 if (running_) |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 static_cast<int>(elapsed_time / frame_time_) % frame_count_; | 82 static_cast<int>(elapsed_time / frame_time_) % frame_count_; |
| 82 | 83 |
| 83 int image_size = frames_->height(); | 84 int image_size = frames_->height(); |
| 84 int image_offset = current_frame * image_size; | 85 int image_offset = current_frame * image_size; |
| 85 canvas->DrawImageInt(*frames_, | 86 canvas->DrawImageInt(*frames_, |
| 86 image_offset, 0, image_size, image_size, | 87 image_offset, 0, image_size, image_size, |
| 87 0, 0, image_size, image_size, | 88 0, 0, image_size, image_size, |
| 88 false); | 89 false); |
| 89 } | 90 } |
| 90 | 91 |
| 91 | 92 bool Throbber::HitTestRect(const gfx::Rect& rect) const { |
| 93 return interactive_ ? View::HitTestRect(rect) : false; | |
|
sky
2013/02/05 15:58:52
Why do you need this? Rather than adding set_inter
jennyz
2013/02/05 17:37:20
Yes, you are right, I can just use set_enabled, re
| |
| 94 } | |
| 92 | 95 |
| 93 // Smoothed throbber --------------------------------------------------------- | 96 // Smoothed throbber --------------------------------------------------------- |
| 94 | 97 |
| 95 | 98 |
| 96 // Delay after work starts before starting throbber, in milliseconds. | 99 // Delay after work starts before starting throbber, in milliseconds. |
| 97 static const int kStartDelay = 200; | 100 static const int kStartDelay = 200; |
| 98 | 101 |
| 99 // Delay after work stops before stopping, in milliseconds. | 102 // Delay after work stops before stopping, in milliseconds. |
| 100 static const int kStopDelay = 50; | 103 static const int kStopDelay = 50; |
| 101 | 104 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 159 } | 162 } |
| 160 // Otherwise we paint our tick mark or nothing depending on our state. | 163 // Otherwise we paint our tick mark or nothing depending on our state. |
| 161 if (checked_) { | 164 if (checked_) { |
| 162 int checkmark_x = (width() - checkmark_->width()) / 2; | 165 int checkmark_x = (width() - checkmark_->width()) / 2; |
| 163 int checkmark_y = (height() - checkmark_->height()) / 2; | 166 int checkmark_y = (height() - checkmark_->height()) / 2; |
| 164 canvas->DrawImageInt(*checkmark_, checkmark_x, checkmark_y); | 167 canvas->DrawImageInt(*checkmark_, checkmark_x, checkmark_y); |
| 165 } | 168 } |
| 166 } | 169 } |
| 167 | 170 |
| 168 } // namespace views | 171 } // namespace views |
| OLD | NEW |