Skip to content

Commit

Permalink
Bug corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
ipodishima committed Dec 20, 2011
1 parent b243bef commit fd3c79e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 3 additions & 5 deletions src/Cascade/CLCascadeNavigationController/CLCascadeView.m
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ - (id)initWithFrame:(CGRect)frame {

_scrollView = [[CLScrollView alloc] init]; // frame will be set in setter of _leftInset
[_scrollView setDelegate: self];

[_scrollView setPagingEnabled: YES];

self.leftInset = DEFAULT_LEFT_INSET;
self.widerLeftInset = DEFAULT_WIDER_LEFT_INSET;
self.pullToDetachPages = YES;
Expand Down Expand Up @@ -815,8 +816,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {

///////////////////////////////////////////////////////////////////////////////////////////////////
- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
// set paging enabled (bug fix with auto scrolling when setContentOffset in pushView:)
[_scrollView setPagingEnabled: YES];

}


Expand Down Expand Up @@ -848,8 +848,6 @@ - (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView {
///////////////////////////////////////////////////////////////////////////////////////////////////
- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
if (_flags.isDetachPages) _flags.isDetachPages = NO;
[_scrollView setPagingEnabled: NO];

}


Expand Down
3 changes: 2 additions & 1 deletion src/Cascade/CLSplitViewController/CLSplitCascadeView.m
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,8 @@ - (id) initWithFrame:(CGRect)frame {

- (void) drawRect:(CGRect)rect {
CGContextRef context = UIGraphicsGetCurrentContext();
CGColorRef shadowColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.6].CGColor;
UIColor *color = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.6];
CGColorRef shadowColor = color.CGColor;

CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), OFFSET_SHADOW, shadowColor);
CGContextSetFillColorWithColor(context, shadowColor);
Expand Down

0 comments on commit fd3c79e

Please sign in to comment.