chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm - Issue 2946183002: Mac: Don't replace the alpha on the detached toolbar separator color.

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

Issue 2946183002: Mac: Don't replace the alpha on the detached toolbar separator color. (Closed)

Patch Set: Created 3 years, 6 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:

View unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"

6	6

7 #include "chrome/browser/search/search.h"	7 #include "chrome/browser/search/search.h"

8 #include "chrome/browser/themes/theme_properties.h"	8 #include "chrome/browser/themes/theme_properties.h"

9 #include "chrome/browser/themes/theme_service.h"	9 #include "chrome/browser/themes/theme_service.h"

10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"	10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 }	79 }

80	80

81 // Bottom stroke.	81 // Bottom stroke.

82 NSRect strokeRect = [self bounds];	82 NSRect strokeRect = [self bounds];

83 strokeRect.size.height = [self cr_lineWidth];	83 strokeRect.size.height = [self cr_lineWidth];

84 if (NSIntersectsRect(strokeRect, dirtyRect)) {	84 if (NSIntersectsRect(strokeRect, dirtyRect)) {

85 NSColor* strokeColor =	85 NSColor* strokeColor =

86 tp.GetNSColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR);	86 tp.GetNSColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR);

87 strokeColor = [[self strokeColor] blendedColorWithFraction:morph	87 strokeColor = [[self strokeColor] blendedColorWithFraction:morph

88 ofColor:strokeColor];	88 ofColor:strokeColor];

89 strokeColor = [strokeColor colorWithAlphaComponent:0.5];

90 [strokeColor set];	89 [strokeColor set];

91 NSRectFillUsingOperation(NSIntersectionRect(strokeRect, dirtyRect),	90 NSRectFillUsingOperation(NSIntersectionRect(strokeRect, dirtyRect),

92 NSCompositeSourceOver);	91 NSCompositeSourceOver);

93 }	92 }

94 }	93 }

95	94

96 @end // @implementation BookmarkBarToolbarView	95 @end // @implementation BookmarkBarToolbarView

OLD	NEW