Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef UI_VIEWS_CONTROLS_MD_SLIDER_H_ | 5 #ifndef UI_VIEWS_CONTROLS_MD_SLIDER_H_ |
| 6 #define UI_VIEWS_CONTROLS_MD_SLIDER_H_ | 6 #define UI_VIEWS_CONTROLS_MD_SLIDER_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "ui/views/controls/slider.h" | 9 #include "ui/views/controls/slider.h" |
| 10 #include "ui/views/view.h" | 10 #include "ui/views/view.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 // ui::Slider: | 22 // ui::Slider: |
| 23 void UpdateState(bool control_on) override; | 23 void UpdateState(bool control_on) override; |
| 24 | 24 |
| 25 // views::View: | 25 // views::View: |
| 26 void OnPaint(gfx::Canvas* canvas) override; | 26 void OnPaint(gfx::Canvas* canvas) override; |
| 27 const char* GetClassName() const override; | 27 const char* GetClassName() const override; |
| 28 | 28 |
| 29 protected: | 29 protected: |
| 30 // ui::Slider: | 30 // ui::Slider: |
| 31 int GetThumbWidth() override; | 31 int GetThumbWidth() override; |
| 32 void SetHighlighted(bool focus) override; | |
| 32 | 33 |
| 33 private: | 34 private: |
| 35 // gfx::AnimationDelegate: | |
| 36 void AnimationProgressed(const gfx::Animation* animation) override; | |
| 37 | |
| 34 // Record whether the slider is in the active state or the disabled state. | 38 // Record whether the slider is in the active state or the disabled state. |
| 35 bool is_active_; | 39 bool is_active_; |
| 40 | |
| 41 // Animating value of the current stroke size of the thumb's highlight. | |
| 42 float animating_thumb_value_; | |
|
bruthig
2016/09/22 21:05:24
Can you use a more descriptive name than |animatin
yiyix
2016/09/23 20:35:37
sure, i also noticed that i forget to change the d
| |
| 43 | |
| 44 std::unique_ptr<gfx::SlideAnimation> highlight_animation_; | |
| 36 }; | 45 }; |
| 37 | 46 |
| 38 } // namespace views | 47 } // namespace views |
| 39 | 48 |
| 40 #endif // UI_VIEWS_CONTROLS_MD_SLIDER_H_ | 49 #endif // UI_VIEWS_CONTROLS_MD_SLIDER_H_ |
| OLD | NEW |