Skip to content

Selected title color now matches the controls background color so its visible even if tintColor is white #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fraserscottmorrison wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Selected title color now matches the controls background color so its visible even if tintColor is white #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f5aa9b
Fixed font not being applied initially
fraserscottmorrison Sep 6, 2018
346750a
Title color is now correct, even when tintColor is white
fraserscottmorrison Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ATHMultiSelectionSegmentedControl/Classes/ATHMultiSelectionControlSegmentButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ internal class ATHMultiSelectionControlSegmentButton: UIButton {
internal var isButtonEnabled: Bool {
return _isButtonEnabled
}
/// The color of the text when selected
internal var titleColorSelected: UIColor?

override var isHighlighted: Bool {

Expand Down Expand Up @@ -82,9 +84,9 @@ internal class ATHMultiSelectionControlSegmentButton: UIButton {
*/
fileprivate func _setSelectedState() {

layer.borderColor = backgroundColor?.cgColor
layer.borderColor = self.titleColorSelected?.cgColor
backgroundColor = tintColor
setTitleColor(UIColor.white, for: .normal)
setTitleColor(self.titleColorSelected ?? UIColor.white, for: .normal)

}

Expand Down
3 changes: 3 additions & 0 deletions ATHMultiSelectionSegmentedControl/Classes/ATHMultiSelectionSegmentedControl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ open class MultiSelectionSegmentedControl: UIView {
button.titleLabel?.font = font
button.tintColor = tintColor
button.backgroundColor = backgroundColor
button.titleColorSelected = backgroundColor
button.setButtonSelected(selectedSegmentIndices.contains(index))
button.addTarget(self, action: #selector(self._didTouchUpInsideSegment(_:)), for: .touchUpInside)

Expand Down Expand Up @@ -325,8 +326,10 @@ open class MultiSelectionSegmentedControl: UIView {

let button = ATHMultiSelectionControlSegmentButton(frame: CGRect(x: self.frame.width, y: 0, width: 0, height: self.frame.height))

button.titleLabel?.font = font
button.tintColor = tintColor
button.backgroundColor = backgroundColor
button.titleColorSelected = backgroundColor
button.addTarget(self, action: #selector(self._didTouchUpInsideSegment(_:)), for: .touchUpInside)

button.setTitle(title, for: .normal)
Expand Down