Skip to content

M
Material
Commit b53376dd by Daniel Dahan
Options

development: Update Grid to no longer use an optional views array.

parent d0e01ffe
Showing with 10 additions and 11 deletions
Sources/iOS/ControlView.swift
...@@ -185,12 +185,12 @@ public class ControlView: View { ...@@ -185,12 +185,12 @@ public class ControlView: View {
contentView.grid.columns -= c.grid.columns contentView.grid.columns -= c.grid.columns
addSubview(c) addSubview(c)
grid.views?.append(c) grid.views.append(c)
} }
} }
addSubview(contentView) addSubview(contentView)
grid.views?.append(contentView) grid.views.append(contentView)
// rightControls // rightControls
if let v = rightControls { if let v = rightControls {
...@@ -205,7 +205,7 @@ public class ControlView: View { ...@@ -205,7 +205,7 @@ public class ControlView: View {
contentView.grid.columns -= c.grid.columns contentView.grid.columns -= c.grid.columns
addSubview(c) addSubview(c)
grid.views?.append(c) grid.views.append(c)
} }
} }
......
Sources/iOS/Grid.swift
...@@ -172,7 +172,7 @@ public class Grid { ...@@ -172,7 +172,7 @@ public class Grid {
} }
/// An Array of UIButtons. /// An Array of UIButtons.
public var views: [UIView]? { public var views: [UIView] {
didSet { didSet {
reload() reload()
} }
...@@ -189,19 +189,19 @@ public class Grid { ...@@ -189,19 +189,19 @@ public class Grid {
self.rows = rows self.rows = rows
self.columns = columns self.columns = columns
self.interimSpace = interimSpace self.interimSpace = interimSpace
views = [UIView]()
offset = GridOffset(grid: self) offset = GridOffset(grid: self)
axis = GridAxis(grid: self) axis = GridAxis(grid: self)
} }
/// Reload the button layout. /// Reload the button layout.
public func reload() { public func reload() {
if let v = views {
let gc = axis.inherited ? columns : axis.columns let gc = axis.inherited ? columns : axis.columns
let gr = axis.inherited ? rows : axis.rows let gr = axis.inherited ? rows : axis.rows
var n: Int = 0 var n: Int = 0
for i in 0..<v.count { for i in 0..<views.count {
let child = v[i] let child = views[i]
if let parent = context { if let parent = context {
if parent != child.superview { if parent != child.superview {
...@@ -252,7 +252,6 @@ public class Grid { ...@@ -252,7 +252,6 @@ public class Grid {
} }
} }
} }
}
} }
/// A memory reference to the Grid instance for UIView extensions. /// A memory reference to the Grid instance for UIView extensions.
......
Sources/iOS/NavigationBar.swift
...@@ -219,12 +219,12 @@ public class NavigationBar: UINavigationBar { ...@@ -219,12 +219,12 @@ public class NavigationBar: UINavigationBar {
contentView.grid.columns -= c.grid.columns contentView.grid.columns -= c.grid.columns
titleView.addSubview(c) titleView.addSubview(c)
titleView.grid.views?.append(c) titleView.grid.views.append(c)
} }
} }
titleView.addSubview(contentView) titleView.addSubview(contentView)
titleView.grid.views?.append(contentView) titleView.grid.views.append(contentView)
// rightControls // rightControls
if let v: Array<UIControl> = item.rightControls { if let v: Array<UIControl> = item.rightControls {
...@@ -239,7 +239,7 @@ public class NavigationBar: UINavigationBar { ...@@ -239,7 +239,7 @@ public class NavigationBar: UINavigationBar {
contentView.grid.columns -= c.grid.columns contentView.grid.columns -= c.grid.columns
titleView.addSubview(c) titleView.addSubview(c)
titleView.grid.views?.append(c) titleView.grid.views.append(c)
} }
} }
......
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