views/controls/button/image_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/image_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/image_button.cc

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

index 245942aa58918a1e0ef9ccf7555acc5a5e19844f..0565faed0d0678413ccdf747688bbb2c06024dfe 100644

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

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

@@ -93,7 +93,7 @@ void ImageButton::Paint(gfx::Canvas* canvas) {

SkBitmap ImageButton::GetImageToPaint() {

SkBitmap img;

- if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) {

+ if (!images_[BS_HOT].isNull() && hover_animation_->is_animating()) {

img = SkBitmapOperations::CreateBlendedBitmap(images_[BS_NORMAL],

images_[BS_HOT], hover_animation_->GetCurrentValue());

} else {

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