views/controls/button/custom_button.cc - Issue 1961001: Refactors animation to allow for cleaner subclassing. I'm doing this

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/controls/button/custom_button.cc

Issue 1961001: Refactors animation to allow for cleaner subclassing. I'm doing this (Closed)

Patch Set: Incorporated review feedback Created 10 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: views/controls/button/custom_button.cc

diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc

index ffa5a46040d285c707dbc49fcc2338de19fc367f..534c8a4170718ce45615caf0f191f06a56a23122 100644

--- a/views/controls/button/custom_button.cc

+++ b/views/controls/button/custom_button.cc

@@ -20,7 +20,7 @@ CustomButton::~CustomButton() {

void CustomButton::SetState(ButtonState state) {

if (state != state_) {

- if (animate_on_state_change_ || !hover_animation_->IsAnimating()) {

+ if (animate_on_state_change_ || !hover_animation_->is_animating()) {

animate_on_state_change_ = true;

if (state_ == BS_NORMAL && state == BS_HOT) {

// Button is hovered from a normal state, start hover animation.

« no previous file with comments | « views/animation/bounds_animator.cc ('k') | views/controls/button/image_button.cc » ('j') | no next file with comments »