summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/bookmark_bar_folder_controller.mm65
-rw-r--r--chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm87
2 files changed, 111 insertions, 41 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
index ff556df..179b553 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
@@ -377,22 +377,22 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
[self adjustButtonWidths] + (2 * bookmarks::kBookmarkVerticalPadding) +
bookmarks::kScrollViewContentWidthMargin;
NSPoint newWindowTopLeft = [self windowTopLeftForWidth:windowWidth];
- NSSize windowSize = [scrollView_ convertSize:NSMakeSize(windowWidth,
- windowHeight)
- toView:nil];
- newWindowTopLeft.y -= windowSize.height;
+ NSSize windowSize = NSMakeSize(windowWidth, windowHeight);
+ windowSize = [scrollView_ convertSize:windowSize toView:nil];
+ NSWindow* window = [self window];
+ // If the window is already visible then make sure its top remains stable.
+ BOOL windowAlreadyShowing = [window isVisible];
+ CGFloat deltaY = windowHeight - NSHeight([mainView_ frame]);
+ if (windowAlreadyShowing) {
+ NSRect oldFrame = [window frame];
+ newWindowTopLeft.y = oldFrame.origin.y + NSHeight(oldFrame);
+ }
NSRect windowFrame = NSMakeRect(newWindowTopLeft.x,
- newWindowTopLeft.y,
- windowSize.width,
- windowSize.height);
-
+ newWindowTopLeft.y - windowHeight, windowSize.width, windowHeight);
// Make the scrolled content be the right size (full size).
- NSRect mainViewFrame = NSMakeRect(0, 0,
- windowWidth -
- bookmarks::kScrollViewContentWidthMargin,
- windowHeight);
+ NSRect mainViewFrame = NSMakeRect(0, 0, NSWidth(windowFrame) -
+ bookmarks::kScrollViewContentWidthMargin, NSHeight(windowFrame));
[mainView_ setFrame:mainViewFrame];
-
// Make sure the window fits on the screen. If not, constrain.
// We'll scroll to allow the user to see all the content.
NSRect screenFrame = [[[self window] screen] frame];
@@ -404,17 +404,33 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
} else {
scrollable_ = NO;
}
- NSWindow* window = [self window];
- [window setFrame:windowFrame display:YES];
- // If scrollable then offset the view and show the arrows.
+ [window setFrame:windowFrame display:NO];
if (wasScrollable != scrollable_) {
- NSSize windowLocalSize = [scrollView_ convertSize:windowFrame.size
- fromView:nil];
- [mainView_ scrollPoint:NSMakePoint(0, (NSHeight(mainViewFrame) -
- windowLocalSize.height))];
+ // If scrollability changed then rework visibility of the scroll arrows
+ // and the scroll offset of the menu view.
+ NSSize windowLocalSize =
+ [scrollView_ convertSize:windowFrame.size fromView:nil];
+ CGFloat scrollPointY = NSHeight(mainViewFrame) - windowLocalSize.height +
+ bookmarks::kBookmarkVerticalPadding;
+ [mainView_ scrollPoint:NSMakePoint(0, scrollPointY)];
[self showOrHideScrollArrows];
[self addOrUpdateScrollTracking];
+ } else if (scrollable_ && windowAlreadyShowing) {
+ // If the window was already showing and is still scrollable then make
+ // sure the main view moves upward, not downward so that the content
+ // at the bottom of the menu, not the top, appears to move.
+ // The edge case is when the menu is scrolled all the way to top (hence
+ // the test of scrollDownArrowShown_) - don't scroll then.
+ NSView* superView = [mainView_ superview];
+ DCHECK([superView isKindOfClass:[NSClipView class]]);
+ NSClipView* clipView = static_cast<NSClipView*>(superView);
+ CGFloat scrollPointY = [clipView bounds].origin.y +
+ bookmarks::kBookmarkVerticalPadding;
+ if (scrollDownArrowShown_ || deltaY > 0.0)
+ scrollPointY += deltaY;
+ [mainView_ scrollPoint:NSMakePoint(0, scrollPointY)];
}
+ [window display];
}
// Determine window size and position.
@@ -429,7 +445,8 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
int buttons = std::max(node->GetChildCount() - startingIndex, 1);
// Prelim height of the window. We'll trim later as needed.
- int height = buttons * bookmarks::kBookmarkButtonHeight;
+ int height = buttons * bookmarks::kBookmarkButtonHeight +
+ bookmarks::kBookmarkVerticalPadding;
// We'll need this soon...
[self window];
@@ -1237,7 +1254,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
[self closeBookmarkFolder:self];
// Prelim height of the window. We'll trim later as needed.
- int height = [buttons_ count] * bookmarks::kBookmarkButtonHeight;
+ int height = [buttons_ count] * bookmarks::kBookmarkButtonHeight +
+ bookmarks::kBookmarkVerticalPadding;
[self adjustWindowForHeight:height];
}
@@ -1370,7 +1388,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
}
// Propose a height for the window. We'll trim later as needed.
- int height = buttonCount * bookmarks::kBookmarkButtonHeight;
+ int height = buttonCount * bookmarks::kBookmarkButtonHeight +
+ bookmarks::kBookmarkVerticalPadding;
[self adjustWindowForHeight:height];
}
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
index 4b5dda2..74cafad 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
@@ -121,7 +121,7 @@ const int kLotsOfNodesCount = 150;
class BookmarkBarFolderControllerTest : public CocoaTest {
public:
BrowserTestHelper helper_;
- scoped_nsobject<BookmarkBarController> parentBarController_;
+ scoped_nsobject<BookmarkBarController> bar_;
const BookmarkNode* folderA_; // owned by model
const BookmarkNode* longTitleNode_; // owned by model
@@ -149,21 +149,21 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
model->AddURL(folderB, folderB->GetChildCount(), L"t",
GURL("http://www.google.com/c"));
- parentBarController_.reset(
+ bar_.reset(
[[BookmarkBarControllerChildFolderRedirect alloc]
initWithBrowser:helper_.browser()
initialWidth:300
delegate:nil
resizeDelegate:nil]);
- [parentBarController_ loaded:model];
+ [bar_ loaded:model];
// Make parent frame for bookmark bar then open it.
NSRect frame = [[test_window() contentView] frame];
frame = NSInsetRect(frame, 100, 200);
NSView* fakeToolbarView = [[[NSView alloc] initWithFrame:frame]
autorelease];
[[test_window() contentView] addSubview:fakeToolbarView];
- [fakeToolbarView addSubview:[parentBarController_ view]];
- [parentBarController_ setBookmarkBarEnabled:YES];
+ [fakeToolbarView addSubview:[bar_ view]];
+ [bar_ setBookmarkBarEnabled:YES];
}
// Remove the bookmark with the long title.
@@ -187,13 +187,12 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
// Return a simple BookmarkBarFolderController.
BookmarkBarFolderControllerPong* SimpleBookmarkBarFolderController() {
- BookmarkButton* parentButton = [[parentBarController_ buttons]
- objectAtIndex:0];
+ BookmarkButton* parentButton = [[bar_ buttons] objectAtIndex:0];
BookmarkBarFolderControllerPong* c =
[[BookmarkBarFolderControllerPong alloc]
initWithParentButton:parentButton
parentController:nil
- barController:parentBarController_];
+ barController:bar_];
[c window]; // Force nib load.
return c;
}
@@ -241,8 +240,7 @@ TEST_F(BookmarkBarFolderControllerTest, ReleaseOnClose) {
}
TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
- BookmarkButton* parentButton = [[parentBarController_ buttons]
- objectAtIndex:0];
+ BookmarkButton* parentButton = [[bar_ buttons] objectAtIndex:0];
EXPECT_TRUE(parentButton);
// If parent is a BookmarkBarController, grow down.
@@ -250,7 +248,7 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
bbfc.reset([[BookmarkBarFolderControllerLow alloc]
initWithParentButton:parentButton
parentController:nil
- barController:parentBarController_]);
+ barController:bar_]);
[bbfc window];
[bbfc setRealTopLeft:YES];
NSPoint pt = [bbfc windowTopLeftForWidth:0]; // screen coords
@@ -272,7 +270,7 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
bbfc2.reset([[BookmarkBarFolderControllerLow alloc]
initWithParentButton:[[bbfc buttons] objectAtIndex:0]
parentController:bbfc.get()
- barController:parentBarController_]);
+ barController:bar_]);
[bbfc2 window];
[bbfc2 setRealTopLeft:YES];
pt = [bbfc2 windowTopLeftForWidth:0];
@@ -297,8 +295,7 @@ TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) {
// Setup initial state for opening all folders.
folder = parent;
- BookmarkButton* parentButton = [[parentBarController_ buttons]
- objectAtIndex:0];
+ BookmarkButton* parentButton = [[bar_ buttons] objectAtIndex:0];
BookmarkBarFolderController* parentController = nil;
EXPECT_TRUE(parentButton);
@@ -310,7 +307,7 @@ TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) {
[[BookmarkBarFolderControllerNoLevel alloc]
initWithParentButton:parentButton
parentController:parentController
- barController:parentBarController_];
+ barController:bar_];
[folder_controller_array addObject:bbfcl];
[bbfcl autorelease];
[bbfcl window];
@@ -412,7 +409,7 @@ TEST_F(BookmarkBarFolderControllerTest, ChildFolderCallbacks) {
scoped_nsobject<BookmarkBarFolderControllerPong> bbfc;
bbfc.reset(SimpleBookmarkBarFolderController());
EXPECT_TRUE(bbfc.get());
- [parentBarController_ setChildFolderDelegate:bbfc.get()];
+ [bar_ setChildFolderDelegate:bbfc.get()];
EXPECT_FALSE([bbfc childFolderWillShow]);
[bbfc openBookmarkFolderFromButton:[[bbfc buttons] objectAtIndex:0]];
@@ -422,7 +419,7 @@ TEST_F(BookmarkBarFolderControllerTest, ChildFolderCallbacks) {
[bbfc closeBookmarkFolder:nil];
EXPECT_TRUE([bbfc childFolderWillClose]);
- [parentBarController_ setChildFolderDelegate:nil];
+ [bar_ setChildFolderDelegate:nil];
}
// Make sure bookmark folders have variable widths.
@@ -505,6 +502,59 @@ TEST_F(BookmarkBarFolderControllerTest, SimpleScroll) {
}
}
+// Folder menu sizing and placementwhile deleting bookmarks and scrolling tests.
+TEST_F(BookmarkBarFolderControllerTest, MenuPlacementWhileScrollingDeleting) {
+ scoped_nsobject<BookmarkBarFolderController> bbfc;
+ AddLotsOfNodes();
+ bbfc.reset(SimpleBookmarkBarFolderController());
+ [bbfc showWindow:bbfc.get()];
+ NSWindow* menuWindow = [bbfc window];
+ BookmarkBarFolderController* folder = [bar_ folderController];
+ NSArray* buttons = [folder buttons];
+
+ // Before scrolling any, delete a bookmark and make sure the window top has
+ // not moved. Pick a button which is near the top and visible.
+ CGFloat oldTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
+ BookmarkButton* button = [buttons objectAtIndex:3];
+ [folder deleteBookmark:button];
+ CGFloat newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
+ EXPECT_CGFLOAT_EQ(oldTop, newTop);
+
+ // Scroll so that both the top and bottom scroll arrows show, make sure
+ // the top of the window has moved up, then delete a visible button and
+ // make sure the top has not moved.
+ oldTop = newTop;
+ const CGFloat scrollOneBookmark = bookmarks::kBookmarkButtonHeight +
+ bookmarks::kBookmarkVerticalPadding;
+ NSUInteger buttonCounter = 0;
+ NSUInteger extraButtonLimit = 3;
+ while (![bbfc canScrollDown] || extraButtonLimit > 0) {
+ [bbfc performOneScroll:scrollOneBookmark];
+ ++buttonCounter;
+ if ([bbfc canScrollDown])
+ --extraButtonLimit;
+ }
+ newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
+ EXPECT_NE(oldTop, newTop);
+ oldTop = newTop;
+ button = [buttons objectAtIndex:buttonCounter + 3];
+ [folder deleteBookmark:button];
+ newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
+ EXPECT_CGFLOAT_EQ(oldTop, newTop);
+
+ // Scroll so that the top scroll arrow is no longer showing, make sure
+ // the top of the window has not moved, then delete a visible button and
+ // make sure the top has not moved.
+ while ([bbfc canScrollDown]) {
+ [bbfc performOneScroll:-scrollOneBookmark];
+ --buttonCounter;
+ }
+ button = [buttons objectAtIndex:buttonCounter + 3];
+ [folder deleteBookmark:button];
+ newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
+ EXPECT_CGFLOAT_EQ(oldTop, newTop);
+}
+
@interface FakedDragInfo : NSObject {
@public
NSPoint dropLocation_;
@@ -1080,7 +1130,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
EXPECT_TRUE(folderController);
NSWindow* folderMenu = [folderController window];
EXPECT_TRUE(folderMenu);
- CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkButtonHeight;
+ CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkButtonHeight +
+ bookmarks::kBookmarkVerticalPadding;
NSRect menuFrame = [folderMenu frame];
CGFloat menuHeight = NSHeight(menuFrame);
EXPECT_CGFLOAT_EQ(expectedHeight, menuHeight);
generated by cgit v1.1 at 2025-02-19 08:24:46 +0000