OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_folder_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" |
6 | 6 |
7 #include "base/mac/mac_util.h" | 7 #include "base/mac/mac_util.h" |
8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
10 #include "chrome/browser/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/bookmarks/bookmark_utils.h" |
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
835 [buttonThatMouseIsIn_ toggleButtonBorderingWhileMouseInside]; | 835 [buttonThatMouseIsIn_ toggleButtonBorderingWhileMouseInside]; |
836 NSRect windowFrame = [[self window] frame]; | 836 NSRect windowFrame = [[self window] frame]; |
837 NSSize newSize = NSMakeSize(NSWidth(windowFrame), 0.0); | 837 NSSize newSize = NSMakeSize(NSWidth(windowFrame), 0.0); |
838 [self adjustWindowLeft:windowFrame.origin.x | 838 [self adjustWindowLeft:windowFrame.origin.x |
839 size:newSize | 839 size:newSize |
840 scrollingBy:finalDelta]; | 840 scrollingBy:finalDelta]; |
841 } | 841 } |
842 } | 842 } |
843 | 843 |
844 - (CGFloat)determineFinalScrollDelta:(CGFloat)delta { | 844 - (CGFloat)determineFinalScrollDelta:(CGFloat)delta { |
845 if (delta > 0.0 && ![scrollUpArrowView_ isHidden] || | 845 if ((delta > 0.0 && ![scrollUpArrowView_ isHidden]) || |
846 delta < 0.0 && ![scrollDownArrowView_ isHidden]) { | 846 (delta < 0.0 && ![scrollDownArrowView_ isHidden])) { |
847 NSWindow* window = [self window]; | 847 NSWindow* window = [self window]; |
848 NSRect windowFrame = [window frame]; | 848 NSRect windowFrame = [window frame]; |
849 NSScreen* screen = [window screen]; | 849 NSScreen* screen = [window screen]; |
850 NSPoint scrollPosition = [scrollView_ documentVisibleRect].origin; | 850 NSPoint scrollPosition = [scrollView_ documentVisibleRect].origin; |
851 CGFloat scrollY = scrollPosition.y; | 851 CGFloat scrollY = scrollPosition.y; |
852 NSRect scrollerFrame = [scrollView_ frame]; | 852 NSRect scrollerFrame = [scrollView_ frame]; |
853 CGFloat scrollerY = NSMinY(scrollerFrame); | 853 CGFloat scrollerY = NSMinY(scrollerFrame); |
854 NSRect visibleFrame = [visibleView_ frame]; | 854 NSRect visibleFrame = [visibleView_ frame]; |
855 CGFloat visibleY = NSMinY(visibleFrame); | 855 CGFloat visibleY = NSMinY(visibleFrame); |
856 CGFloat windowY = NSMinY(windowFrame); | 856 CGFloat windowY = NSMinY(windowFrame); |
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1672 | 1672 |
1673 - (void)setIgnoreAnimations:(BOOL)ignore { | 1673 - (void)setIgnoreAnimations:(BOOL)ignore { |
1674 ignoreAnimations_ = ignore; | 1674 ignoreAnimations_ = ignore; |
1675 } | 1675 } |
1676 | 1676 |
1677 - (BookmarkButton*)buttonThatMouseIsIn { | 1677 - (BookmarkButton*)buttonThatMouseIsIn { |
1678 return buttonThatMouseIsIn_; | 1678 return buttonThatMouseIsIn_; |
1679 } | 1679 } |
1680 | 1680 |
1681 @end // BookmarkBarFolderController | 1681 @end // BookmarkBarFolderController |
OLD | NEW |