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

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

Issue 2554913002: Prevent overlay scrollbars expand or hover together (Closed)
Patch Set: fix for test 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 "base/time/time.h"
11 #include "cc/base/cc_export.h" 12 #include "cc/base/cc_export.h"
12 #include "cc/input/scrollbar_animation_controller.h" 13 #include "cc/input/scrollbar_animation_controller.h"
14 #include "cc/layers/layer_impl.h"
15 #include "cc/layers/scrollbar_layer_impl_base.h"
16 #include "ui/gfx/geometry/vector2d_f.h"
13 17
14 namespace cc { 18 namespace cc {
15 19
16 // Scrollbar animation that partially fades and thins after an idle delay, 20 // ScrollbarAnimationControllerThinning for one scrollbar
17 // and reacts to mouse movements. 21 class CC_EXPORT SingleScrollbarAnimationControllerThinning {
18 class CC_EXPORT ScrollbarAnimationControllerThinning
19 : public ScrollbarAnimationController {
20 public: 22 public:
21 static std::unique_ptr<ScrollbarAnimationControllerThinning> Create( 23 static std::unique_ptr<SingleScrollbarAnimationControllerThinning> Create(
22 int scroll_layer_id, 24 int scroll_layer_id,
25 ScrollbarOrientation orientation,
23 ScrollbarAnimationControllerClient* client, 26 ScrollbarAnimationControllerClient* client,
24 base::TimeDelta delay_before_starting,
25 base::TimeDelta resize_delay_before_starting,
26 base::TimeDelta fade_duration,
27 base::TimeDelta thinning_duration); 27 base::TimeDelta thinning_duration);
28 28
29 ~ScrollbarAnimationControllerThinning() override; 29 ~SingleScrollbarAnimationControllerThinning() {}
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 bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; } 34 bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; }
35 bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; } 35 bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; }
36 bool captured() const { return captured_; }
36 37
37 void DidScrollUpdate(bool on_resize) override; 38 bool Animate(base::TimeTicks now);
38 void DidScrollEnd() override; 39 void StartAnimation();
40 void StopAnimation();
39 41
40 void DidMouseDown() override; 42 void UpdateThumbThicknessScale();
41 void DidMouseUp() override;
42 void DidMouseLeave() override;
43 void DidMouseMoveNear(float distance) override;
44 bool ScrollbarsHidden() const override;
45 43
46 protected: 44 void DidMouseDown();
47 ScrollbarAnimationControllerThinning( 45 void DidMouseUp();
46 void DidMouseLeave();
47 void DidMouseMoveNear(float distance);
48
49 bool hidden() const { return hidden_; }
50 void setHidden(bool hidden) { hidden_ = hidden; }
51
52 private:
53 SingleScrollbarAnimationControllerThinning(
48 int scroll_layer_id, 54 int scroll_layer_id,
55 ScrollbarOrientation orientation,
49 ScrollbarAnimationControllerClient* client, 56 ScrollbarAnimationControllerClient* client,
50 base::TimeDelta delay_before_starting,
51 base::TimeDelta resize_delay_before_starting,
52 base::TimeDelta fade_duration,
53 base::TimeDelta thinning_duration); 57 base::TimeDelta thinning_duration);
54 58
55 void RunAnimationFrame(float progress) override; 59 float AnimationProgressAtTime(base::TimeTicks now);
56 const base::TimeDelta& Duration() override; 60 void RunAnimationFrame(float progress);
61 const base::TimeDelta& Duration();
57 62
58 private:
59 // Describes whether the current animation should INCREASE (thicken) 63 // Describes whether the current animation should INCREASE (thicken)
60 // a bar or DECREASE it (thin). 64 // a bar or DECREASE it (thin).
61 enum AnimationChange { NONE, INCREASE, DECREASE }; 65 enum AnimationChange { NONE, INCREASE, DECREASE };
62 enum AnimatingProperty { OPACITY, THICKNESS };
63 float ThumbThicknessScaleAt(float progress); 66 float ThumbThicknessScaleAt(float progress);
67
64 float AdjustScale(float new_value, 68 float AdjustScale(float new_value,
65 float current_value, 69 float current_value,
66 AnimationChange animation_change, 70 AnimationChange animation_change,
67 float min_value, 71 float min_value,
68 float max_value); 72 float max_value);
69 void ApplyOpacity(float opacity);
70 void ApplyThumbThicknessScale(float thumb_thickness_scale); 73 void ApplyThumbThicknessScale(float thumb_thickness_scale);
71 74
72 void SetCurrentAnimatingProperty(AnimatingProperty property); 75 ScrollbarAnimationControllerClient* client_;
73 76
74 float opacity_; 77 base::TimeTicks last_awaken_time_;
78 bool is_animating_;
79
80 int scroll_layer_id_;
81
82 ScrollbarOrientation orientation_;
83 bool hidden_;
75 bool captured_; 84 bool captured_;
76 bool mouse_is_over_scrollbar_; 85 bool mouse_is_over_scrollbar_;
77 bool mouse_is_near_scrollbar_; 86 bool mouse_is_near_scrollbar_;
78 // Are we narrowing or thickening the bars. 87 // Are we narrowing or thickening the bars.
79 AnimationChange thickness_change_; 88 AnimationChange thickness_change_;
80 // How close should the mouse be to the scrollbar before we thicken it. 89 // How close should the mouse be to the scrollbar before we thicken it.
81 float mouse_move_distance_to_trigger_animation_; 90 float mouse_move_distance_to_trigger_animation_;
82 91
83 base::TimeDelta fade_duration_;
84 base::TimeDelta thinning_duration_; 92 base::TimeDelta thinning_duration_;
85 93
86 AnimatingProperty current_animating_property_; 94 DISALLOW_COPY_AND_ASSIGN(SingleScrollbarAnimationControllerThinning);
87
88 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerThinning);
89 }; 95 };
90 96
91 } // namespace cc 97 } // namespace cc
92 98
93 #endif // CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 99 #endif // CC_INPUT_SINGLE_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698