diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 05:43:44 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 05:43:44 +0000 |
commit | c5cb15a495d51e52e0704f0eb4a2e5e92b963f9a (patch) | |
tree | 6c9cb827af73d11d463c87dab763aeb75e4db47a /chrome/browser/cocoa/bookmark_bar_folder_controller.h | |
parent | a44e6102cd74889a4394516db97a2d7bddd1255d (diff) | |
download | chromium_src-c5cb15a495d51e52e0704f0eb4a2e5e92b963f9a.zip chromium_src-c5cb15a495d51e52e0704f0eb4a2e5e92b963f9a.tar.gz chromium_src-c5cb15a495d51e52e0704f0eb4a2e5e92b963f9a.tar.bz2 |
Improve bookmark bar folder scroll.
BUG=39791
TEST=\
Create bookmark folders with various quantites of bookmarks.
Make sure normal folders work.
Open some that don't fit on the screen.
See rounded corners on bottom.
Try and move mouse to bottom of screen --> window grows and scrolls.
Move mouse to top of screen --> window does NOT change size but does scroll.
Move mouse off folder while scrolling --> scrolling stops.
Make sure no buttons get "stuck" with a mouse-enter (highlit).
Make sure no "getting stuck" or "window scrolls off the screen".
Briefly test subfolders.
xib changes:
- Window content view is now BookmarkBarFolderWindowContentView
- BookmaerkBarFolderView now wrapped in an NSScrollView
- Some view autosizing changed
Review URL: http://codereview.chromium.org/1593025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_folder_controller.h')
-rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_controller.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.h b/chrome/browser/cocoa/bookmark_bar_folder_controller.h index d13d51d..24d81f5 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.h +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.h @@ -56,9 +56,20 @@ // Our buttons. We do not have buttons for nested folders. scoped_nsobject<NSMutableArray> buttons_; + // The scroll view that contains our main button view (below). + IBOutlet NSScrollView* scrollView_; + + // Are we scrollable? If no, the full contents of the folder are + // always visible. + BOOL scrollable_; + // The main view of this window (where the buttons go). IBOutlet BookmarkBarFolderView* mainView_; + // Weak; we keep track to work around a + // setShowsBorderOnlyWhileMouseInside bug. + BookmarkButton* buttonThatMouseIsIn_; + // The context menu for a bookmark button which represents an URL. IBOutlet NSMenu* buttonMenu_; @@ -129,5 +140,6 @@ - (BookmarkBarFolderController*)folderController; - (id)folderTarget; - (void)configureWindowLevel; +- (void)performOneScroll:(CGFloat)delta; @end |