Skip to content

增加 "标题是否在顶部显示" #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CodeXey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

增加 "标题是否在顶部显示" #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Pods/Pods.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions SDCycleScrollView.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>SDCycleScrollView.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
8 changes: 8 additions & 0 deletions SDCycleScrollView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file added SDCycleScrollView.xcworkspace/xcuserdata/CodeX.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,7 @@
/** 只展示文字轮播 */
@property (nonatomic, assign) BOOL onlyDisplayText;

/** 标题是否在顶部显示 */
@property (nonatomic, assign) BOOL showOnTop;

@end
2 changes: 1 addition & 1 deletion SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ - (void)layoutSubviews
CGFloat titleLabelW = self.sd_width;
CGFloat titleLabelH = _titleLabelHeight;
CGFloat titleLabelX = 0;
CGFloat titleLabelY = self.sd_height - titleLabelH;
CGFloat titleLabelY = self.showOnTop ? 0 : self.sd_height - titleLabelH;
_titleLabel.frame = CGRectMake(titleLabelX, titleLabelY, titleLabelW, titleLabelH);
}
}
Expand Down
3 changes: 3 additions & 0 deletions SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ typedef enum {
/** 滚动手势禁用（文字轮播较实用） */
- (void)disableScrollGesture;

/** 标题是否在顶部显示 */
@property (nonatomic, assign) BOOL showOnTop;


////////////////////// 清除缓存API //////////////////////

Expand Down
2 changes: 1 addition & 1 deletion SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
SDCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:ID forIndexPath:indexPath];

cell.showOnTop = self.showOnTop;
long itemIndex = [self pageControlIndexWithCurrentCellIndex:indexPath.item];

if ([self.delegate respondsToSelector:@selector(setupCustomCell:forIndex:cycleScrollView:)] &&
Expand Down