diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 16:19:43 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 16:19:43 +0000 |
commit | 41e91a55d14f4b7dde4fd4bfb5f4f69272af6536 (patch) | |
tree | bc980a0e13af91407291843816e2daf73991da36 /chrome/browser/cocoa/bookmark_bar_folder_window.mm | |
parent | a25802de384b5571971f773fcb6e70c4ccb80b5d (diff) | |
download | chromium_src-41e91a55d14f4b7dde4fd4bfb5f4f69272af6536.zip chromium_src-41e91a55d14f4b7dde4fd4bfb5f4f69272af6536.tar.gz chromium_src-41e91a55d14f4b7dde4fd4bfb5f4f69272af6536.tar.bz2 |
(
Retry of http://codereview.chromium.org/1731001
Try servers not helpful since this includes a binary file.
Unfortunately I did a --gtest_filter=BookmarkBar\* to self-test
which did not include BookmarkButton* tests :-(
Only change is "size" to "cellSize" on 2nd to last line of TEST_F(BookmarkButtonCellTest, FolderArrow)
)
UI review follow-up for m5 bookmark bar deliverables
Remove border of the (empty) bookmark item.
Add arrow icons for folders in bookmark bar folder windows (but not on the bar)
Scroll wheel events now scroll the bookmark bar folder windows (mostly
works; has a little leak-thru)
BUG=42026
TEST=see description
xib change: NSScrollView changes to a BookmarkBarFolderWindowScrollView
Review URL: http://codereview.chromium.org/1709004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_folder_window.mm')
-rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_window.mm | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_window.mm b/chrome/browser/cocoa/bookmark_bar_folder_window.mm index 6cae7c5..732bed1 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_window.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_window.mm @@ -4,7 +4,9 @@ #import "chrome/browser/cocoa/bookmark_bar_folder_window.h" +#import "base/logging.h" #import "base/scoped_nsobject.h" +#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" @@ -72,3 +74,20 @@ const CGFloat kViewCornerRadius = 4.0; } @end + + +@implementation BookmarkBarFolderWindowScrollView + +// We want "draw background" of the NSScrollView in the xib to be NOT +// checked. That allows us to round the bottom corners of the folder +// window. However that also allows some scrollWheel: events to leak +// into the NSWindow behind it (even in a different application). +// Better to plug the scroll leak than to round corners for M5. +- (void)scrollWheel:(NSEvent *)theEvent { + DCHECK([[[self window] windowController] + respondsToSelector:@selector(scrollWheel:)]); + [[[self window] windowController] scrollWheel:theEvent]; +} + + +@end |