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

Side by Side Diff: ui/views/animation/ink_drop_animation_controller.h

Issue 1422593003: Made material design ink drop QUICK_ACTION animation more visible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged in changes to ink drop hover. Created 5 years, 1 month 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_ 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_
6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_ 6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "ui/compositor/layer_tree_owner.h" 10 #include "ui/compositor/layer_tree_owner.h"
(...skipping 14 matching lines...) Expand all
25 class VIEWS_EXPORT InkDropAnimationController { 25 class VIEWS_EXPORT InkDropAnimationController {
26 public: 26 public:
27 virtual ~InkDropAnimationController() {} 27 virtual ~InkDropAnimationController() {}
28 28
29 // Gets the current state of the ink drop. 29 // Gets the current state of the ink drop.
30 virtual InkDropState GetInkDropState() const = 0; 30 virtual InkDropState GetInkDropState() const = 0;
31 31
32 // Animates from the current InkDropState to |ink_drop_state|. 32 // Animates from the current InkDropState to |ink_drop_state|.
33 virtual void AnimateToState(InkDropState ink_drop_state) = 0; 33 virtual void AnimateToState(InkDropState ink_drop_state) = 0;
34 34
35 // Returns true if the ink drop animation will automatically transition to the
36 // HIDDEN state when the current state animation completes.
37 virtual bool WillAutoAnimateToHidden() const = 0;
38
35 // Enables or disables the hover state. 39 // Enables or disables the hover state.
36 virtual void SetHovered(bool is_hovered) = 0; 40 virtual void SetHovered(bool is_hovered) = 0;
37 41
38 // Returns true if the hover state is enabled. 42 // Returns true if the hover state is enabled.
39 virtual bool IsHovered() const = 0; 43 virtual bool IsHovered() const = 0;
40 44
41 virtual gfx::Size GetInkDropLargeSize() const = 0; 45 virtual gfx::Size GetInkDropLargeSize() const = 0;
42 46
43 // Sets the different sizes of the ink drop. 47 // Sets the different sizes of the ink drop.
44 virtual void SetInkDropSize(const gfx::Size& large_size, 48 virtual void SetInkDropSize(const gfx::Size& large_size,
45 int large_corner_radius, 49 int large_corner_radius,
46 const gfx::Size& small_size, 50 const gfx::Size& small_size,
47 int small_corner_radius) = 0; 51 int small_corner_radius) = 0;
48 52
49 // Sets the |center_point| of the ink drop relative to its parent Layer. 53 // Sets the |center_point| of the ink drop relative to its parent Layer.
50 virtual void SetInkDropCenter(const gfx::Point& center_point) = 0; 54 virtual void SetInkDropCenter(const gfx::Point& center_point) = 0;
51 55
52 protected: 56 protected:
53 InkDropAnimationController() {} 57 InkDropAnimationController() {}
54 58
55 private: 59 private:
56 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationController); 60 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationController);
57 }; 61 };
58 62
59 } // namespace views 63 } // namespace views
60 64
61 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_ 65 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698