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
61fd93ca
Commit
61fd93ca
authored
Sep 05, 2017
by
Daniel Dahan
Committed by
GitHub
Sep 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development' into feature/text-field-label-sizes
parents
f347a0b2
f48c068c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
14 deletions
+18
-14
Sources/iOS/TextField.swift
+18
-14
No files found.
Sources/iOS/TextField.swift
View file @
61fd93ca
...
...
@@ -211,19 +211,23 @@ open class TextField: UITextField {
/// This property adds a padding to placeholder y position animation
@IBInspectable
open
var
placeholderVerticalOffset
:
CGFloat
=
0
/// The scale of the active placeholder in relation to the inactive
@IBInspectable
open
var
placeholderActiveScale
:
CGFloat
=
0.75
{
didSet
{
layoutPlaceholderLabel
()
}
}
open
var
placeholderVerticalOffset
:
CGFloat
=
0
/// This property adds a padding to placeholder y position animation
@IBInspectable
open
var
placeholderHorizinalOffset
:
CGFloat
=
0
/// The scale of the active placeholder in relation to the inactive
@IBInspectable
open
var
placeholderActiveScale
:
CGFloat
=
0.75
{
didSet
{
layoutPlaceholderLabel
()
}
}
/// The detailLabel UILabel that is displayed.
@IBInspectable
open
let
detailLabel
=
UILabel
()
open
let
detailLabel
=
UILabel
()
/// The detailLabel text value.
@IBInspectable
...
...
@@ -513,9 +517,9 @@ fileprivate extension TextField {
switch
textAlignment
{
case
.
left
,
.
natural
:
placeholderLabel
.
x
=
w
placeholderLabel
.
x
=
w
+
placeholderHorizinalOffset
case
.
right
:
placeholderLabel
.
x
=
width
-
placeholderLabel
.
width
-
textInset
placeholderLabel
.
x
=
width
-
placeholderLabel
.
width
-
textInset
+
placeholderHorizinalOffset
default
:
break
}
...
...
@@ -650,9 +654,9 @@ extension TextField {
switch
s
.
textAlignment
{
case
.
left
,
.
natural
:
s
.
placeholderLabel
.
x
=
s
.
leftViewWidth
+
s
.
textInset
s
.
placeholderLabel
.
x
=
s
.
leftViewWidth
+
s
.
textInset
+
s
.
placeholderHorizinalOffset
case
.
right
:
s
.
placeholderLabel
.
x
=
s
.
width
-
s
.
placeholderLabel
.
width
-
s
.
textInset
s
.
placeholderLabel
.
x
=
s
.
width
-
s
.
placeholderLabel
.
width
-
s
.
textInset
+
s
.
placeholderHorizinalOffset
default
:
break
}
...
...
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