mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default alignment fix

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-01-17 15:56:48 -05:00
parent 20dbbc0829
commit 299a519e20
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Containers/Container.swift
View File

@ -197,7 +197,7 @@ public class ContainerHelper: NSObject {
} }
open class Container: View, ContainerProtocol { open class Container: View, ContainerProtocol {
var view: UIView? public var view: UIView?
let containerHelper = ContainerHelper() let containerHelper = ContainerHelper()
var containerModel: ContainerModelProtocol? { var containerModel: ContainerModelProtocol? {
get { return model as? ContainerModelProtocol } get { return model as? ContainerModelProtocol }

1
MVMCoreUI/Containers/ContainerProtocol.swift
View File

@ -9,6 +9,7 @@
import Foundation import Foundation
public protocol ContainerProtocol { public protocol ContainerProtocol {
var view: UIView? { get set }
func alignHorizontal(_ alignment: UIStackView.Alignment) func alignHorizontal(_ alignment: UIStackView.Alignment)
func alignVertical(_ alignment: UIStackView.Alignment) func alignVertical(_ alignment: UIStackView.Alignment)
func constrainView(_ view: UIView) func constrainView(_ view: UIView)

4
MVMCoreUI/Organisms/Stack.swift
View File

@ -190,8 +190,8 @@ open class Stack<T>: Container where T: StackModelProtocol {
let spacing = model.spacing ?? stackModel.spacing let spacing = model.spacing ?? stackModel.spacing
if let container = view as? ContainerProtocol { if let container = view as? ContainerProtocol {
let verticalAlignment = (model as? ContainerModelProtocol)?.verticalAlignment ?? (view as? MVMCoreUIViewConstrainingProtocol)?.verticalAlignment?() ?? (model.percent == nil && stackModel.axis == .vertical ? .fill : (stackModel.axis == .vertical ? .leading : .center)) let verticalAlignment = (model as? ContainerModelProtocol)?.verticalAlignment ?? (container.view as? MVMCoreUIViewConstrainingProtocol)?.verticalAlignment?() ?? (model.percent == nil && stackModel.axis == .vertical ? .fill : (stackModel.axis == .vertical ? .leading : .center))
let horizontalAlignment = (model as? ContainerModelProtocol)?.horizontalAlignment ?? (view as? MVMCoreUIViewConstrainingProtocol)?.horizontalAlignment?() ?? (stackModel.axis == .vertical || model.percent == nil ? .fill : .leading) let horizontalAlignment = (model as? ContainerModelProtocol)?.horizontalAlignment ?? (container.view as? MVMCoreUIViewConstrainingProtocol)?.horizontalAlignment?() ?? (stackModel.axis == .vertical || model.percent == nil ? .fill : .leading)
container.alignHorizontal(horizontalAlignment) container.alignHorizontal(horizontalAlignment)
container.alignVertical(verticalAlignment) container.alignVertical(verticalAlignment)
} }