Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2017-05-11 17:58:20 +0300
committerSergey Yershov <syershov@maps.me>2017-05-11 18:55:19 +0300
commitac4ce517263fdc3af6ae11b37d5743a3da2e71f3 (patch)
treec3d6aa71ef30cf3b1c6010a8aa8025b10551753c
parentc5f8af3ad116192006153952530793d5e27c072f (diff)
[ios] Fixed wrong border color of button.beta-802
-rw-r--r--iphone/Maps/Classes/Components/BorderedButton.swift6
1 files changed, 3 insertions, 3 deletions
diff --git a/iphone/Maps/Classes/Components/BorderedButton.swift b/iphone/Maps/Classes/Components/BorderedButton.swift
index 6ea3cf842f..f10e5a4694 100644
--- a/iphone/Maps/Classes/Components/BorderedButton.swift
+++ b/iphone/Maps/Classes/Components/BorderedButton.swift
@@ -19,11 +19,11 @@ final class BorderedButton: UIButton {
private func updateBorder() {
if !isEnabled {
- layer.borderColor = borderDisabledColor?.cgColor
+ layer.borderColor = borderDisabledColor?.cgColor ?? titleColor(for: .disabled)?.cgColor
} else if isHighlighted {
- layer.borderColor = borderHighlightedColor?.cgColor
+ layer.borderColor = borderHighlightedColor?.cgColor ?? titleColor(for: .highlighted)?.cgColor
} else {
- layer.borderColor = borderColor?.cgColor
+ layer.borderColor = borderColor?.cgColor ?? titleColor(for: .normal)?.cgColor
}
}