Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
b83c2091
Commit
b83c2091
authored
May 19, 2019
by
Orkhan Alikhanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent Button.titleLabel.font overriding storyboard value
parent
23d3045d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
Sources/iOS/Button/Button.swift
+2
-1
No files found.
Sources/iOS/Button/Button.swift
View file @
b83c2091
...
@@ -179,7 +179,9 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
...
@@ -179,7 +179,9 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
*/
*/
public
override
init
(
frame
:
CGRect
)
{
public
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
super
.
init
(
frame
:
frame
)
/// Set these here to avoid overriding storyboard values
tintColor
=
Color
.
blue
.
base
tintColor
=
Color
.
blue
.
base
titleLabel
?
.
font
=
Theme
.
font
.
regular
(
with
:
fontSize
)
prepare
()
prepare
()
}
}
...
@@ -274,7 +276,6 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
...
@@ -274,7 +276,6 @@ open class Button: UIButton, Pulseable, PulseableLayer, Themeable {
*/
*/
open
func
prepare
()
{
open
func
prepare
()
{
contentScaleFactor
=
Screen
.
scale
contentScaleFactor
=
Screen
.
scale
titleLabel
?
.
font
=
Theme
.
font
.
regular
(
with
:
fontSize
)
prepareVisualLayer
()
prepareVisualLayer
()
preparePulse
()
preparePulse
()
applyCurrentTheme
()
applyCurrentTheme
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment