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
b445f62f
Commit
b445f62f
authored
Oct 09, 2015
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated pulse views
parent
b52dc86e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
Source/MaterialButton.swift
+0
-2
Source/MaterialLayer.swift
+3
-3
Source/MaterialPulseView.swift
+0
-2
No files found.
Source/MaterialButton.swift
View file @
b445f62f
...
@@ -418,8 +418,6 @@ public class MaterialButton : UIButton {
...
@@ -418,8 +418,6 @@ public class MaterialButton : UIButton {
*/
*/
public
func
prepareView
()
{
public
func
prepareView
()
{
// pulseLayer
// pulseLayer
pulseLayer
.
hidden
=
true
pulseLayer
.
zPosition
=
1
materialLayer
.
visualLayer
.
addSublayer
(
pulseLayer
)
materialLayer
.
visualLayer
.
addSublayer
(
pulseLayer
)
}
}
...
...
Source/MaterialLayer.swift
View file @
b445f62f
...
@@ -304,9 +304,9 @@ public class MaterialLayer : CAShapeLayer {
...
@@ -304,9 +304,9 @@ public class MaterialLayer : CAShapeLayer {
*/
*/
public
func
prepareLayer
()
{
public
func
prepareLayer
()
{
// visualLayer
// visualLayer
//
masksToBounds = true
masksToBounds
=
true
//
visualLayer.zPosition = -1
visualLayer
.
zPosition
=
-
1
//
addSublayer(visualLayer)
addSublayer
(
visualLayer
)
}
}
//
//
...
...
Source/MaterialPulseView.swift
View file @
b445f62f
...
@@ -152,8 +152,6 @@ public class MaterialPulseView : MaterialView {
...
@@ -152,8 +152,6 @@ public class MaterialPulseView : MaterialView {
borderColor
=
MaterialTheme
.
pulseView
.
bordercolor
borderColor
=
MaterialTheme
.
pulseView
.
bordercolor
// pulseLayer
// pulseLayer
pulseLayer
.
hidden
=
true
pulseLayer
.
zPosition
=
1
materialLayer
.
visualLayer
.
addSublayer
(
pulseLayer
)
materialLayer
.
visualLayer
.
addSublayer
(
pulseLayer
)
}
}
...
...
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