diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 21:56:11 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 21:56:11 +0000 |
commit | beef79e05335d38b887f079420a1225df7438aad (patch) | |
tree | 27690fa049017a09a437e597da43a5ad7995c347 /chrome/browser/cocoa | |
parent | ce3eb76d250266a2166dcacadc15b843b46b0520 (diff) | |
download | chromium_src-beef79e05335d38b887f079420a1225df7438aad.zip chromium_src-beef79e05335d38b887f079420a1225df7438aad.tar.gz chromium_src-beef79e05335d38b887f079420a1225df7438aad.tar.bz2 |
Don't draw the highlight border of a button which is disabled.
BUG=http://crbug.com/54725
Review URL: http://codereview.chromium.org/3369010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r-- | chrome/browser/cocoa/gradient_button_cell.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/gradient_button_cell.mm b/chrome/browser/cocoa/gradient_button_cell.mm index d5b40b9..4cab381 100644 --- a/chrome/browser/cocoa/gradient_button_cell.mm +++ b/chrome/browser/cocoa/gradient_button_cell.mm @@ -517,7 +517,8 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4; innerPath:&innerPath clipPath:NULL]; - BOOL pressed = [self isHighlighted]; + BOOL pressed = ([((NSControl*)[self controlView]) isEnabled] && + [self isHighlighted]); NSWindow* window = [controlView window]; ThemeProvider* themeProvider = [window themeProvider]; BOOL active = [window isKeyWindow] || [window isMainWindow]; |