views/controls/button/custom_button.cc - Issue 6976048: views: Add OnEnabledChanged() method to View class.

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 6976048: views: Add OnEnabledChanged() method to View class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win, move OnEnabledChanged to protected section, add comment Created 9 years, 7 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 95ecb988c478c34c3b293bdea1bc9afe1e1c8462..944699d8d09a862c73f703a41df10f4ed33c50ab 100644

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

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

@@ -91,11 +91,11 @@ bool CustomButton::IsHotTracked() const {

return state_ == BS_HOT;

}

-void CustomButton::SetEnabled(bool enabled) {

- if (enabled ? (state_ != BS_DISABLED) : (state_ == BS_DISABLED))

+void CustomButton::OnEnabledChanged() {

+ if (View::IsEnabled() ? (state_ != BS_DISABLED) : (state_ == BS_DISABLED))

return;

- if (enabled)

+ if (View::IsEnabled())

SetState(IsMouseHovered() ? BS_HOT : BS_NORMAL);

else

SetState(BS_DISABLED);