ui/views/controls/button/image_button.cc - Issue 2406323002: CustomButton: restrict animation repaints to buttons that actually animate

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

Issue 2406323002: CustomButton: restrict animation repaints to buttons that actually animate (Closed)

Patch Set: don't use bool(T*) Created 4 years, 2 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: ui/views/controls/button/image_button.cc

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

index 483d971bbea836c6fceacbee82433f7dcf3704a6..d9426bea1f3daecc2faa985e6e4f9741a79645be 100644

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

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

@@ -48,6 +48,8 @@ const gfx::ImageSkia& ImageButton::GetImage(ButtonState state) const {

}

void ImageButton::SetImage(ButtonState for_state, const gfx::ImageSkia* image) {

+ if (for_state == STATE_HOVERED)

+ set_animate_on_state_change(image != nullptr);

images_[for_state] = image ? *image : gfx::ImageSkia();

PreferredSizeChanged();

if (state() == for_state)

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