exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-09-11 05:05:23 +03:00
Code Issues Projects Releases Wiki Activity

support opacity in svg element

Browse Source
This commit is contained in:
ZHENG Shilin 2018-12-19 18:36:43 +01:00 committed by Yuri Strot
parent f745c9a732
commit 7f437e8e52
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/svg/SVGParser.swift
View File

@ -119,23 +119,32 @@ open class SVGParser {
config.shouldProcessNamespaces = true
}
let parsedXml = config.parse(xmlString)
var layout: NodeLayout?
var svgElement: XMLElement!
for child in parsedXml.children {
if let element = child.element {
if element.name == "svg" {
layout = try parseViewBox(element)
svgElement = element
try prepareSvg(child.children)
break
}
}
}
try parseSvg(parsedXml.children)
if let layout = layout {
return SVGCanvas(layout: layout, contents: nodes)
var group: Group
if let layout = try parseViewBox(svgElement!) {
group = SVGCanvas(layout: layout, contents: nodes)
} else {
group = Group(contents: nodes)
}
return Group(contents: nodes)
// global opacity
if let opacity = svgElement.attribute(by: "opacity") {
group.opacity = Double(opacity.text)!
}
return group
}
fileprivate func prepareSvg(_ children: [XMLIndexer]) throws {
@ -232,7 +241,7 @@ open class SVGParser {
var result: Node?
if let element = node.element {
let style = getStyleAttributes(groupStyle, element: element)
if style["display"] == "none" {
if style["display"] == "none" || style["visibility"] == "hidden" {
return .none
}
switch element.name {