Skip to content
Snippets Groups Projects
Commit d5668e3c authored by George Nachman's avatar George Nachman
Browse files

Fix bug where right border wasn't shown with overlay scrollers in lion

parent bb1d8efa
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -61,6 +61,7 @@
- (id)initWithFrame:(NSRect)frame hasVerticalScroller:(BOOL)hasVerticalScroller;
- (void)scrollWheel:(NSEvent *)theEvent;
- (void)detectUserScroll;
- (BOOL)isLegacyScroller;
 
// background image
- (NSImage *)backgroundImage;
Loading
Loading
Loading
Loading
@@ -107,7 +107,7 @@
return [super hitPart];
}
 
- (BOOL)_isLegacyScroller
- (BOOL)isLegacyScroller
{
if ([self respondsToSelector:@selector(scrollerStyle)]) {
return [self scrollerStyle] == NSScrollerStyleLegacy;
Loading
Loading
@@ -118,7 +118,7 @@
 
- (void)drawRect:(NSRect)dirtyRect {
if (IsLionOrLater() &&
![self _isLegacyScroller] &&
![self isLegacyScroller] &&
self.hasDarkBackground &&
dirtyRect.size.width > 0 &&
dirtyRect.size.height > 0) {
Loading
Loading
@@ -273,7 +273,7 @@
timer_ = nil;
}
 
- (BOOL)_isLegacyScroller
- (BOOL)isLegacyScroller
{
if ([self respondsToSelector:@selector(scrollerStyle)]) {
return [self scrollerStyle] == NSScrollerStyleLegacy;
Loading
Loading
@@ -293,7 +293,7 @@
 
- (void)setHasVerticalScroller:(BOOL)flag inInit:(BOOL)inInit
{
if ([self _isLegacyScroller]) {
if ([self isLegacyScroller]) {
[super setHasVerticalScroller:flag];
return;
}
Loading
Loading
Loading
Loading
@@ -3583,7 +3583,8 @@ NSString *sessionsKey = @"sessions";
windowType_ == WINDOW_TYPE_TOP ||
windowType_ == WINDOW_TYPE_BOTTOM) {
return NO;
} else if (![self scrollbarShouldBeVisible]) {
} else if (![[[self currentSession] SCROLLVIEW] isLegacyScroller] ||
![self scrollbarShouldBeVisible]) {
// hidden scrollbar
return YES;
} else {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment