Skip to content

Improvements #2

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
giuseppeoncia wants to merge 1 commit into
base: swift4
Choose a base branch
from
Open

Improvements #2

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
23 changes: 14 additions & 9 deletions WeePager/MenuView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@ class MenuView: UIScrollView {
menuButton.addTarget(self, action: #selector(MenuView.buttonPressed(sender:)), for: .touchUpInside)

buttons.append(menuButton)

if buttons.count == 1 {
let indicatorY = ((pagerReference.indicatorAlign == .top) ? 0 : (pagerReference.indicatorAlign == .bottom) ? self.frame.height-pagerReference.indicatorHeight : (self.frame.height-pagerReference.indicatorHeight) / 2) - pagerReference.indicatorOffsetY
let indicatorWidth = (pagerReference.indicatorWidthAnimated) ? buttons[0].frame.width : pagerReference.indicatorWidth
indicator = pagerReference.indicatorView
indicator.frame = CGRect(x: pagerReference.menuInset + buttons[0].frame.width/2 - indicatorWidth/2, y: indicatorY, width: indicatorWidth, height: pagerReference.indicatorHeight)
indicator.layer.cornerRadius = pagerReference.indicatorCornerRadius
indicator.backgroundColor = pagerReference.indicatorColor
indicator.alpha = pagerReference.indicatorAlpha
self.addSubview(indicator)
}

self.addSubview(menuButton)
myOffset += menuButton.frame.width + myItemInset
}
Expand All @@ -85,15 +97,6 @@ class MenuView: UIScrollView {

contentSize = CGSize(width: myOffset, height: pagerReference.menuHeight)

let indicatorY = ((pagerReference.indicatorAlign == .top) ? 0 : (pagerReference.indicatorAlign == .bottom) ? self.frame.height-pagerReference.indicatorHeight : (self.frame.height-pagerReference.indicatorHeight) / 2) - pagerReference.indicatorOffsetY
let indicatorWidth = (pagerReference.indicatorWidthAnimated) ? buttons[0].frame.width : pagerReference.indicatorWidth
indicator = pagerReference.indicatorView
indicator.frame = CGRect(x: pagerReference.menuInset + buttons[0].frame.width/2 - indicatorWidth/2, y: indicatorY, width: indicatorWidth, height: pagerReference.indicatorHeight)
indicator.layer.cornerRadius = pagerReference.indicatorCornerRadius
indicator.backgroundColor = pagerReference.indicatorColor
indicator.alpha = pagerReference.indicatorAlpha
self.addSubview(indicator)

//Shadow
setShadow()
}
Expand Down Expand Up @@ -127,6 +130,8 @@ class MenuView: UIScrollView {
}
contentSize = CGSize(width: myOffset, height: pagerReference.menuHeight)
indicator.frame.origin.x = getButtonPosition(index: pagerReference.getPage()) - indicator.frame.width/2
let indicatorY = ((pagerReference.indicatorAlign == .top) ? 0 : (pagerReference.indicatorAlign == .bottom) ? self.frame.height-pagerReference.indicatorHeight : (self.frame.height-pagerReference.indicatorHeight) / 2) - pagerReference.indicatorOffsetY
indicator.frame = CGRect(x: indicator.frame.origin.x, y: indicatorY, width: indicator.frame.width, height: pagerReference.indicatorHeight)
}

@objc private func buttonPressed(sender: UIButton) {
Expand Down
4 changes: 3 additions & 1 deletion WeePager/WeePager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,10 @@ public class WeePager: UIView {
}
body.delegate = nil
super.layoutSubviews()
body.updateLayout()
menu.frame = CGRect(x: 0, y: (self.menuPosition == .top) ? 0 : self.frame.height-self.menuHeight, width: self.frame.width, height: self.menuHeight)
menu.updateLayout()
body.frame = CGRect(x: 0, y: (self.menuPosition == .top) ? self.menuHeight : 0, width:self.frame.width, height: self.frame.height-self.menuHeight)
body.updateLayout()
body.delegate = body
}

Expand Down