Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: cc/input/single_scrollbar_animation_controller_thinning.h

Issue 2554913002: Prevent overlay scrollbars expand or hover together (Closed)
Patch Set: add ScrollbarAnimationControllerThinningTest Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 5 #ifndef CC_INPUT_SINGLE_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
6 #define CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 6 #define CC_INPUT_SINGLE_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.h"
12 #include "cc/input/scrollbar_animation_controller.h" 12 #include "cc/input/scrollbar_animation_controller.h"
13 13
14 namespace cc { 14 namespace cc {
15 15
16 // Scrollbar animation that partially fades and thins after an idle delay, 16 // ScrollbarAnimationControllerThinning for one scrollbar
17 // and reacts to mouse movements. 17 class CC_EXPORT SingleScrollbarAnimationControllerThinning
18 class CC_EXPORT ScrollbarAnimationControllerThinning
19 : public ScrollbarAnimationController { 18 : public ScrollbarAnimationController {
20 public: 19 public:
21 static std::unique_ptr<ScrollbarAnimationControllerThinning> Create( 20 static std::unique_ptr<SingleScrollbarAnimationControllerThinning> Create(
22 int scroll_layer_id, 21 int scroll_layer_id,
22 ScrollbarOrientation orientation,
23 ScrollbarAnimationControllerClient* client, 23 ScrollbarAnimationControllerClient* client,
24 base::TimeDelta delay_before_starting, 24 base::TimeDelta delay_before_starting,
25 base::TimeDelta resize_delay_before_starting, 25 base::TimeDelta resize_delay_before_starting,
26 base::TimeDelta fade_duration, 26 base::TimeDelta fade_duration,
27 base::TimeDelta thinning_duration); 27 base::TimeDelta thinning_duration);
28 28
29 ~ScrollbarAnimationControllerThinning() override; 29 ~SingleScrollbarAnimationControllerThinning() override {}
30 30
31 void set_mouse_move_distance_for_test(float distance) { 31 void set_mouse_move_distance_for_test(float distance) {
32 mouse_move_distance_to_trigger_animation_ = distance; 32 mouse_move_distance_to_trigger_animation_ = distance;
33 } 33 }
34 ScrollbarOrientation orientation() const { return orientation_; }
34 bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; } 35 bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; }
35 bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; } 36 bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; }
36 37
37 void DidScrollUpdate(bool on_resize) override; 38 void DidScrollUpdate(bool on_resize) override;
38 39
39 void DidMouseDown() override; 40 void DidMouseDown() override;
40 void DidMouseUp() override; 41 void DidMouseUp() override;
41 void DidMouseLeave() override; 42 void DidMouseLeave() override;
42 void DidMouseMoveNear(float distance) override;
43 bool ScrollbarsHidden() const override; 43 bool ScrollbarsHidden() const override;
44 void RunAnimationFrame(float progress) override;
45 const base::TimeDelta& Duration() override;
46 void DidMouseMoveNear(ScrollbarOrientation, float) override;
44 47
45 protected: 48 protected:
46 ScrollbarAnimationControllerThinning( 49 SingleScrollbarAnimationControllerThinning(
47 int scroll_layer_id, 50 int scroll_layer_id,
51 ScrollbarOrientation orientation,
48 ScrollbarAnimationControllerClient* client, 52 ScrollbarAnimationControllerClient* client,
49 base::TimeDelta delay_before_starting, 53 base::TimeDelta delay_before_starting,
50 base::TimeDelta resize_delay_before_starting, 54 base::TimeDelta resize_delay_before_starting,
51 base::TimeDelta fade_duration, 55 base::TimeDelta fade_duration,
52 base::TimeDelta thinning_duration); 56 base::TimeDelta thinning_duration);
53 57
54 void RunAnimationFrame(float progress) override;
55 const base::TimeDelta& Duration() override;
56
57 private: 58 private:
58 // Describes whether the current animation should INCREASE (thicken) 59 // Describes whether the current animation should INCREASE (thicken)
59 // a bar or DECREASE it (thin). 60 // a bar or DECREASE it (thin).
60 enum AnimationChange { NONE, INCREASE, DECREASE }; 61 enum AnimationChange { NONE, INCREASE, DECREASE };
61 enum AnimatingProperty { OPACITY, THICKNESS }; 62 enum AnimatingProperty { OPACITY, THICKNESS };
62 float ThumbThicknessScaleAt(float progress); 63 float ThumbThicknessScaleAt(float progress);
63 float AdjustScale(float new_value, 64 float AdjustScale(float new_value,
64 float current_value, 65 float current_value,
65 AnimationChange animation_change, 66 AnimationChange animation_change,
66 float min_value, 67 float min_value,
67 float max_value); 68 float max_value);
68 void ApplyOpacity(float opacity); 69 void ApplyOpacity(float opacity);
69 void ApplyThumbThicknessScale(float thumb_thickness_scale); 70 void ApplyThumbThicknessScale(float thumb_thickness_scale);
70 71
71 void SetCurrentAnimatingProperty(AnimatingProperty property); 72 void SetCurrentAnimatingProperty(AnimatingProperty property);
72 73
74 ScrollbarOrientation orientation_;
73 float opacity_; 75 float opacity_;
74 bool captured_; 76 bool captured_;
75 bool mouse_is_over_scrollbar_; 77 bool mouse_is_over_scrollbar_;
76 bool mouse_is_near_scrollbar_; 78 bool mouse_is_near_scrollbar_;
77 // Are we narrowing or thickening the bars. 79 // Are we narrowing or thickening the bars.
78 AnimationChange thickness_change_; 80 AnimationChange thickness_change_;
79 // How close should the mouse be to the scrollbar before we thicken it. 81 // How close should the mouse be to the scrollbar before we thicken it.
80 float mouse_move_distance_to_trigger_animation_; 82 float mouse_move_distance_to_trigger_animation_;
81 83
82 base::TimeDelta fade_duration_; 84 base::TimeDelta fade_duration_;
83 base::TimeDelta thinning_duration_; 85 base::TimeDelta thinning_duration_;
84 86
85 AnimatingProperty current_animating_property_; 87 AnimatingProperty current_animating_property_;
86 88
87 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerThinning); 89 DISALLOW_COPY_AND_ASSIGN(SingleScrollbarAnimationControllerThinning);
88 }; 90 };
89 91
90 } // namespace cc 92 } // namespace cc
91 93
92 #endif // CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 94 #endif // CC_INPUT_SINGLE_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698