exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-08-16 08:30:33 +03:00
Code Issues Projects Releases Wiki Activity

#203 rename position to place of Pattern

Browse Source
This commit is contained in:
Daniil Manin 2019-06-14 17:04:39 +07:00
parent c7ff33a7d6
commit 1234f0bac1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/model/draw/Pattern.swift
View File

@ -4,13 +4,13 @@ open class Pattern: Fill {
public let content: Node
public let bounds: Rect
public let userSpace: Bool
public let position: Transform
public let place: Transform
public init(content: Node, bounds: Rect, viewBox: Rect, userSpace: Bool = false, position: Transform) {
public init(content: Node, bounds: Rect, viewBox: Rect, userSpace: Bool = false, place: Transform) {
self.viewBox = viewBox
self.content = content
self.bounds = bounds
self.userSpace = userSpace
self.position = position
self.place = place
}
}

2
Source/render/ShapeRenderer.swift
View File

@ -193,7 +193,7 @@ class ShapeRenderer: NodeRenderer {
}
let tileImage = renderer.renderToImage(bounds: viewBox, inset: 0)
ctx?.concatenate(pattern.position.toCG())
ctx?.concatenate(pattern.place.toCG())
ctx?.clip()
ctx?.draw(tileImage.cgImage!, in: patternBounds.toCG(), byTiling: true)
}

18
Source/svg/SVGParser.swift
View File

@ -392,7 +392,7 @@ open class SVGParser {
contentUserSpace = false
}
let position = getPatternPosition(element)
let place = getPatternPlace(element)
var contentNode: Node?
if pattern.children.isEmpty {
@ -414,7 +414,7 @@ open class SVGParser {
}
if let contentNode = contentNode {
return UserSpacePattern(content: contentNode, bounds: bounds, viewBox: viewBox, userSpace: userSpace, contentUserSpace: contentUserSpace, position: position)
return UserSpacePattern(content: contentNode, bounds: bounds, viewBox: viewBox, userSpace: userSpace, contentUserSpace: contentUserSpace, place: place)
}
return .none
}
@ -439,7 +439,7 @@ open class SVGParser {
return parseTransformationAttribute(transformAttribute)
}
fileprivate func getPatternPosition(_ element: SWXMLHash.XMLElement) -> Transform {
fileprivate func getPatternPlace(_ element: SWXMLHash.XMLElement) -> Transform {
guard let transformAttribute = element.allAttributes["patternTransform"]?.text else {
return .identity
}
@ -692,14 +692,14 @@ open class SVGParser {
fileprivate func getPatternFill(pattern: UserSpacePattern, locus: Locus?) -> Pattern {
if pattern.userSpace == false && pattern.contentUserSpace == true {
let tranform = BoundsUtils.transformForLocusInRespectiveCoords(respectiveLocus: pattern.bounds, absoluteLocus: locus!)
return Pattern(content: pattern.content, bounds: pattern.bounds.applying(tranform), viewBox: pattern.viewBox, userSpace: true, position: pattern.position)
return Pattern(content: pattern.content, bounds: pattern.bounds.applying(tranform), viewBox: pattern.viewBox, userSpace: true, place: pattern.place)
}
if pattern.userSpace == true && pattern.contentUserSpace == false {
if let patternNode = BoundsUtils.createNodeFromRespectiveCoords(respectiveNode: pattern.content, absoluteLocus: locus!) {
return Pattern(content: patternNode, bounds: pattern.bounds, viewBox: pattern.viewBox, userSpace: pattern.userSpace, position: pattern.position)
return Pattern(content: patternNode, bounds: pattern.bounds, viewBox: pattern.viewBox, userSpace: pattern.userSpace, place: pattern.place)
}
}
return Pattern(content: pattern.content, bounds: pattern.bounds, viewBox: pattern.viewBox, userSpace: true, position: pattern.position)
return Pattern(content: pattern.content, bounds: pattern.bounds, viewBox: pattern.viewBox, userSpace: true, place: pattern.place)
}
fileprivate func getStroke(_ styleParts: [String: String], groupStyle: [String: String] = [:]) -> Stroke? {
@ -1945,15 +1945,15 @@ fileprivate class UserSpacePattern {
let bounds: Rect
let userSpace: Bool
let contentUserSpace: Bool
let position: Transform
let place: Transform
init(content: Node, bounds: Rect, viewBox: Rect = Rect(x: 0, y: 0, w: 0, h: 0), userSpace: Bool = false, contentUserSpace: Bool = true, position: Transform = .identity) {
init(content: Node, bounds: Rect, viewBox: Rect = Rect(x: 0, y: 0, w: 0, h: 0), userSpace: Bool = false, contentUserSpace: Bool = true, place: Transform = .identity) {
self.viewBox = viewBox
self.content = content
self.bounds = bounds
self.userSpace = userSpace
self.contentUserSpace = contentUserSpace
self.position = position
self.place = place
}
}