Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6233)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

Issue 2200303004: [Mac][Material Design] Adjust bookmark spacing and folder menu drawing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index de372e4be69481972d4eb0ab219e7b8eff142c8d..0efc9a69dfbef438e33e853dce9316dde89e6003 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -332,6 +332,13 @@ CGFloat BookmarkBottomVerticalPadding() {
NSRect windowFrame = [[self window] frame];
NSRect scrollViewFrame = [scrollView_ frame];
padding_ = NSWidth(windowFrame) - NSWidth(scrollViewFrame);
+ // In Material Design, each menu row spans the entire width of the menu.
+ if (ui::MaterialDesignController::IsModeMaterial()) {
+ scrollViewFrame.size.width += 2 * padding_;
+ scrollViewFrame.origin.x = 0;
+ [scrollView_ setFrame:scrollViewFrame];
tapted 2016/08/04 02:00:55 I think has the unwanted side-effect of causing th
shrike 2016/08/04 20:54:47 Thanks for catching that. This new patchset should
+ padding_ = 0;
+ }
verticalScrollArrowHeight_ = NSHeight([scrollUpArrowView_ frame]);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ -390,7 +397,7 @@ CGFloat BookmarkBottomVerticalPadding() {
image:image
menuController:menuController];
if (ui::MaterialDesignController::IsModeMaterial()) {
- [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+ [cell setTag:kMaterialMenuButtonTypeWithLimitedClickFeedback];
} else {
[cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
}
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698