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

Merge branch 'bugfix/label_layout_constraint_fix' into 'feature/coding'

Browse Source 
Bugfix/label layout constraint fix

See merge request BPHV_MIPS/mvm_core_ui!227
This commit is contained in:
Pfeil, Scott Robert 2020-01-21 13:54:30 -05:00
commit 747132f72d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Molecules/Doughnut/DoughnutChart.swift
View File

@ -176,7 +176,7 @@ open class DoughnutChart: View {
labelContainer.layoutIfNeeded() labelContainer.layoutIfNeeded()
let radius = sizeObject.getValueBasedOnApplicationWidth()/2 - lineWidth() let radius = sizeObject.getValueBasedOnApplicationWidth()/2 - lineWidth()
let labelheight = labelContainer.frame.height/2 let labelheight = labelContainer.frame.height/2
let padding = sizeObject.getValueBasedOnApplicationWidth()/2 - sqrt(pow(radius, 2) - pow(labelheight, 2)) let padding = sizeObject.getValueBasedOnApplicationWidth()/2 - sqrt(max(0, pow(radius, 2) - pow(labelheight, 2)))
labelContainerLeftConstraint?.constant = padding labelContainerLeftConstraint?.constant = padding
labelContainerRightConstraint?.constant = padding labelContainerRightConstraint?.constant = padding

2
MVMCoreUI/Molecules/Doughnut/DoughnutChartView.swift
View File

@ -26,7 +26,7 @@ import Foundation
addSubview(colorLablesStack) addSubview(colorLablesStack)
doughnutChart.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true doughnutChart.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
doughnutChart.topAnchor.constraint(equalTo: topAnchor, constant: PaddingFour).isActive = true doughnutChart.topAnchor.constraint(equalTo: topAnchor).isActive = true
bottomAnchor.constraint(greaterThanOrEqualTo: doughnutChart.bottomAnchor).isActive = true bottomAnchor.constraint(greaterThanOrEqualTo: doughnutChart.bottomAnchor).isActive = true
let doughnutBottomAnchor = bottomAnchor.constraint(equalTo: doughnutChart.bottomAnchor) let doughnutBottomAnchor = bottomAnchor.constraint(equalTo: doughnutChart.bottomAnchor)

2
MVMCoreUI/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift
View File

@ -26,7 +26,7 @@ import Foundation
let list = try typeContainer.decodeMolecules(codingKey: .list) let list = try typeContainer.decodeMolecules(codingKey: .list)
var models: [MoleculeStackItemModel] = [] var models: [MoleculeStackItemModel] = []
for (index, molecule) in list.enumerated() { for (index, molecule) in list.enumerated() {
models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index).", molecule: molecule))) models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule)))
} }
super.init(molecules: models) super.init(molecules: models)
spacing = 0 spacing = 0