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

button width to column changes

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2021-04-06 16:54:36 -04:00
parent 758ccff930
commit f29878e174
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
View File

@ -168,10 +168,14 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
} }
open override var intrinsicContentSize: CGSize { open override var intrinsicContentSize: CGSize {
if buttonSize == .tiny {
let size = super.intrinsicContentSize let size = super.intrinsicContentSize
let width = size.width + (2 * getInnerPadding()) let width = size.width + (2 * getInnerPadding())
return CGSize(width: max(width, getMinimumWidth()), height: getHeight()) return CGSize(width: max(width, getMinimumWidth()), height: getHeight())
} else {
let width = Padding.Component.gutterForApplicationWidth + (2.0 * Padding.Component.columnFor(size: MVMCoreUISplitViewController.getApplicationViewWidth()))
return CGSize(width: min(292, width), height: getHeight())
}
} }
//-------------------------------------------------- //--------------------------------------------------

8
MVMCoreUI/Styles/MFStyler+PaddingExtension.swift
View File

@ -18,6 +18,14 @@ import Foundation
Padding.Component.gutterFor(size: size) Padding.Component.gutterFor(size: size)
} }
@objc static func bridgeGetColumnSizeForForApplicationWidth() -> CGFloat {
Padding.Component.columnFor(size: MVMCoreUISplitViewController.getApplicationViewWidth())
}
@objc static func bridgeGetColumnSize(for size: CGFloat) -> CGFloat {
Padding.Component.columnFor(size: size)
}
@objc static func bridgeHorizontalPaddingFor(size: CGFloat) -> CGFloat { @objc static func bridgeHorizontalPaddingFor(size: CGFloat) -> CGFloat {
Padding.Component.horizontalPaddingForSize(size) Padding.Component.horizontalPaddingForSize(size)
} }

4
MVMCoreUI/Styles/Padding.swift
View File

@ -55,5 +55,9 @@ public struct Padding {
let sizeObject = MFSizeObject(standardSize: HorizontalGutterSpacing)! let sizeObject = MFSizeObject(standardSize: HorizontalGutterSpacing)!
return sizeObject.getValueBased(onSize: size) return sizeObject.getValueBased(onSize: size)
} }
public static func columnFor(size: CGFloat) -> CGFloat {
return (size - (3.0 * gutterFor(size: size)) - (2.0 * horizontalPaddingForSize(size))) / 4.0
}
} }
} }