Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
c3b1a8e9
Unverified
Commit
c3b1a8e9
authored
Apr 15, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed delegation calls for scrollView that influenced the TabBar
parent
58a621a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
45 deletions
+10
-45
Sources/iOS/PageMenuController.swift
+10
-45
No files found.
Sources/iOS/PageMenuController.swift
View file @
c3b1a8e9
...
...
@@ -102,9 +102,6 @@ open class PageMenuController: UIViewController {
@IBInspectable
open
let
scrollView
=
UIScrollView
()
/// Previous scroll view content offset.
fileprivate
var
previousContentOffset
:
CGFloat
=
0
/// An Array of UIViewControllers.
open
var
viewControllers
:
[
UIViewController
]
{
didSet
{
...
...
@@ -123,9 +120,6 @@ open class PageMenuController: UIViewController {
}
}
/// The number of views used in the scrollViewPool.
fileprivate
let
viewPoolCount
=
3
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
...
...
@@ -135,6 +129,12 @@ open class PageMenuController: UIViewController {
super
.
init
(
coder
:
aDecoder
)
}
/// Previous scroll view content offset.
fileprivate
var
previousContentOffset
:
CGFloat
=
0
/// The number of views used in the scrollViewPool.
fileprivate
let
viewPoolCount
=
3
/**
An initializer that accepts an Array of UIViewControllers.
- Parameter viewControllers: An Array of UIViewControllers.
...
...
@@ -445,49 +445,14 @@ extension PageMenuController {
extension
PageMenuController
:
UIScrollViewDelegate
{
@objc
open
func
scrollViewDidScroll
(
_
scrollView
:
UIScrollView
)
{
guard
let
tb
=
tabBar
else
{
return
}
guard
tb
.
isAnimating
else
{
return
}
// guard let selected = tb.selected else {
// return
// }
// let x = (scrollView.contentOffset.x - scrollView.width) / scrollView.contentSize.width * scrollView.width
// tb.line.center.x = selected.center.x + x
}
@objc
open
func
scrollViewWillBeginDragging
(
_
scrollView
:
UIScrollView
)
{
previousContentOffset
=
scrollView
.
contentOffset
.
x
}
@objc
open
func
scrollViewDidEndDecelerating
(
_
scrollView
:
UIScrollView
)
{
let
n
=
viewControllers
.
count
let
x
=
scrollView
.
contentOffset
.
x
let
p
=
previousContentOffset
==
x
?
0
:
previousContentOffset
<
x
?
1
:
-
1
guard
0
!=
p
else
{
return
}
let
i
=
selectedIndex
+
p
guard
selectedIndex
!=
i
else
{
return
}
let
w
=
scrollView
.
width
let
p
=
Int
(
floor
((
scrollView
.
contentOffset
.
x
-
w
/
2
)
/
w
)
+
1
)
print
(
selectedIndex
,
p
)
guard
0
<=
i
&&
i
<
n
else
{
return
}
selectedIndex
=
i
selectedIndex
=
p
removeViewControllers
()
prepareViewControllers
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment