Commit ceca2641 by Daniel Dahan

reworking TabBar layout calculations

parent 04d1cfa7
...@@ -288,9 +288,14 @@ fileprivate extension ChipBar { ...@@ -288,9 +288,14 @@ fileprivate extension ChipBar {
w -= chipItemsInterimSpace w -= chipItemsInterimSpace
scrollView.contentSize = CGSize(width: w, height: scrollView.height) scrollView.contentSize = CGSize(width: w, height: scrollView.height)
} else { } else {
scrollView.grid.begin()
scrollView.grid.views = chipItems scrollView.grid.views = chipItems
scrollView.grid.axis.columns = chipItems.count scrollView.grid.axis.columns = chipItems.count
scrollView.grid.contentEdgeInsets = chipItemsContentEdgeInsets
scrollView.grid.interimSpace = chipItemsInterimSpace
scrollView.grid.commit()
scrollView.contentSize = scrollView.bounds.size scrollView.contentSize = scrollView.bounds.size
} }
} }
......
...@@ -224,7 +224,7 @@ open class TabBar: Bar { ...@@ -224,7 +224,7 @@ open class TabBar: Bar {
super.prepare() super.prepare()
contentEdgeInsetsPreset = .none contentEdgeInsetsPreset = .none
interimSpacePreset = .interimSpace6 interimSpacePreset = .interimSpace6
tabItemsInterimSpacePreset = .none tabItemsInterimSpacePreset = .interimSpace4
prepareContentView() prepareContentView()
prepareScrollView() prepareScrollView()
...@@ -309,9 +309,14 @@ fileprivate extension TabBar { ...@@ -309,9 +309,14 @@ fileprivate extension TabBar {
w -= tabItemsInterimSpace w -= tabItemsInterimSpace
scrollView.contentSize = CGSize(width: w, height: scrollView.height) scrollView.contentSize = CGSize(width: w, height: scrollView.height)
} else { } else {
scrollView.grid.begin()
scrollView.grid.views = tabItems scrollView.grid.views = tabItems
scrollView.grid.axis.columns = tabItems.count scrollView.grid.axis.columns = tabItems.count
scrollView.grid.contentEdgeInsets = tabItemsContentEdgeInsets
scrollView.grid.interimSpace = tabItemsInterimSpace
scrollView.grid.commit()
scrollView.contentSize = scrollView.bounds.size scrollView.contentSize = scrollView.bounds.size
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment