Skip to content

Fix SVG element inside SVG element rendering #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kylehowells wants to merge 7 commits into
base: 3.x
Choose a base branch
from
Open

Fix SVG element inside SVG element rendering #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
421cce8
Update interface builder files to latest Xcode version
kylehowells Mar 7, 2022
4b5977d
Fix demo project
kylehowells Mar 7, 2022
e9a90f3
Disable custom build script
kylehowells Mar 7, 2022
e1226bb
Add new SVG inside SVG test case
kylehowells Mar 7, 2022
bc49e6f
Update VCMainMenuViewController.m
kylehowells Mar 7, 2022
345fe4a
Use the parent SVG element as the viewport to fix rendering bug
kylehowells Mar 7, 2022
710b488
Revert CSS.svg change
kylehowells Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Demo-Samples/Licenses.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
</dict>
<key>Contributed</key>
<dict>
<key>SquareBlocks</key>
<dict>
<key>SquareBlocks</key>
<string>Public Domain</string>
<key>Source Local File</key>
<string>SquareBlocks.svg</string>
</dict>
<key>M-to-S-to-T</key>
<dict>
<key>Source Local File</key>
Expand Down
78 changes: 78 additions & 0 deletions Demo-Samples/SVG/SquareBlocks.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Demo-Samples/Saved Bitmaps/SquareBlocks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 8 additions & 13 deletions Demo-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@
BDC7EAB41B2A5960001F3161 /* CSS.css in Resources */ = {isa = PBXBuildFile; fileRef = BDC7EAB21B2A5960001F3161 /* CSS.css */; };
BDC7EAB51B2A5960001F3161 /* CSS.svg in Resources */ = {isa = PBXBuildFile; fileRef = BDC7EAB31B2A5960001F3161 /* CSS.svg */; };
BDC7EAB81B2A7E4A001F3161 /* CSS.png in Resources */ = {isa = PBXBuildFile; fileRef = BDC7EAB71B2A7E4A001F3161 /* CSS.png */; };
CC1AFFDA27D6C4EF007547A2 /* SquareBlocks.svg in Resources */ = {isa = PBXBuildFile; fileRef = CC1AFFD927D6C4EF007547A2 /* SquareBlocks.svg */; };
CC1AFFDC27D6C639007547A2 /* SquareBlocks.png in Resources */ = {isa = PBXBuildFile; fileRef = CC1AFFDB27D6C639007547A2 /* SquareBlocks.png */; };
D0B21B532016B17D00974D0A /* heart.svg in Resources */ = {isa = PBXBuildFile; fileRef = D0B21B4D2016B17C00974D0A /* heart.svg */; };
D0B21B552016BD8A00974D0A /* heart.png in Resources */ = {isa = PBXBuildFile; fileRef = D0B21B542016BD8A00974D0A /* heart.png */; };
D0D29C9220EC44080003CE47 /* M-to-S-to-T.svg in Resources */ = {isa = PBXBuildFile; fileRef = D0D29C9120EC44080003CE47 /* M-to-S-to-T.svg */; };
Expand Down Expand Up @@ -218,13 +220,6 @@
remoteGlobalIDString = 825CDADC1BDA4D38003C1C12;
remoteInfo = "SVGKitFramework-tvOSTests";
};
66E785A8171A1208001EF59D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6649E1021617574600AFE92A /* SVGKit-iOS.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 6639618D16145D0400E58CCA;
remoteInfo = "SVGKit-iOS";
};
DA02919A25AC893D00297579 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6649E1021617574600AFE92A /* SVGKit-iOS.xcodeproj */;
Expand Down Expand Up @@ -415,6 +410,8 @@
BDC7EAB21B2A5960001F3161 /* CSS.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = CSS.css; sourceTree = "<group>"; };
BDC7EAB31B2A5960001F3161 /* CSS.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = CSS.svg; sourceTree = "<group>"; };
BDC7EAB71B2A7E4A001F3161 /* CSS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CSS.png; sourceTree = "<group>"; };
CC1AFFD927D6C4EF007547A2 /* SquareBlocks.svg */ = {isa = PBXFileReference; lastKnownFileType = text; path = SquareBlocks.svg; sourceTree = "<group>"; };
CC1AFFDB27D6C639007547A2 /* SquareBlocks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SquareBlocks.png; sourceTree = "<group>"; };
D0B21B4D2016B17C00974D0A /* heart.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = heart.svg; sourceTree = "<group>"; };
D0B21B542016BD8A00974D0A /* heart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = heart.png; sourceTree = "<group>"; };
D0D29C9120EC44080003CE47 /* M-to-S-to-T.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "M-to-S-to-T.svg"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -537,6 +534,7 @@
661EEAC81ACC3444007176B0 /* uk-only.png */,
661EEAC91ACC3444007176B0 /* voies.png */,
661EEA521ACC1723007176B0 /* Monkey.png */,
CC1AFFDB27D6C639007547A2 /* SquareBlocks.png */,
661EEA531ACC1723007176B0 /* Note.png */,
);
path = "Saved Bitmaps";
Expand Down Expand Up @@ -718,6 +716,7 @@
8805045A1AA624F20089554C /* radial-gradient-opacity.svg */,
BDC7EAB21B2A5960001F3161 /* CSS.css */,
BDC7EAB31B2A5960001F3161 /* CSS.svg */,
CC1AFFD927D6C4EF007547A2 /* SquareBlocks.svg */,
);
path = SVG;
sourceTree = "<group>";
Expand All @@ -737,7 +736,6 @@
buildRules = (
);
dependencies = (
66E785A9171A1208001EF59D /* PBXTargetDependency */,
32AF7BC221738A0300142396 /* PBXTargetDependency */,
);
name = "Demo-iOS";
Expand Down Expand Up @@ -899,6 +897,7 @@
32D42245217AED3900CFD064 /* LaunchScreen.storyboard in Resources */,
66E862981688BA510059C9C4 /* Location_European_nation_states.svg in Resources */,
D0B21B532016B17D00974D0A /* heart.svg in Resources */,
CC1AFFDA27D6C4EF007547A2 /* SquareBlocks.svg in Resources */,
661EEAA51ACC3053007176B0 /* shapes.png in Resources */,
BDC7EAB41B2A5960001F3161 /* CSS.css in Resources */,
66E862991688BA510059C9C4 /* Map.svg in Resources */,
Expand Down Expand Up @@ -948,6 +947,7 @@
661EEA9B1ACC2FD4007176B0 /* radgrad01.png in Resources */,
661EEAD81ACC3444007176B0 /* Location_European_nation_states.png in Resources */,
662701A11AD9587500B3AD03 /* bike-frame.png in Resources */,
CC1AFFDC27D6C639007547A2 /* SquareBlocks.png in Resources */,
661EEA851ACC2FBB007176B0 /* StyleAttribute.svg in Resources */,
6627019F1AD9585C00B3AD03 /* bike-frame.svg in Resources */,
661ADBFA16CC3399006F4BC3 /* rotated-and-skewed-text.svg in Resources */,
Expand Down Expand Up @@ -1012,11 +1012,6 @@
name = "SVGKitFramework-iOS";
targetProxy = 32AF7BC121738A0300142396 /* PBXContainerItemProxy */;
};
66E785A9171A1208001EF59D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "SVGKit-iOS";
targetProxy = 66E785A8171A1208001EF59D /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down
20 changes: 0 additions & 20 deletions SVGKit-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,7 +2586,6 @@
6639618B16145D0400E58CCA /* Frameworks */,
6639618C16145D0400E58CCA /* CopyFiles */,
6639624616145D3E00E58CCA /* Headers */,
663963481614968A00E58CCA /* ShellScript */,
);
buildRules = (
);
Expand Down Expand Up @@ -2781,23 +2780,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
663963481614968A00E58CCA /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#\n# c.f. StackOverflow question/answer here: http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n#\n# Version 2.3\n#\n# Latest Change:\n# - Apple's handling of \"project files\" is broken; added a workaround for Xcode 4.5\n# - Added automatic FAIL BUILD if any of the internal commands fail\n# \n# Purpose:\n# Create a static library for iPhone from within XCode\n# Because Apple staff DELIBERATELY broke Xcode to make this impossible from the GUI (Xcode 3.2.3 specifically states this in the Release notes!)\n# ...no, I don't understand why they did this!\n#\n# Author: Adam Martin - http://twitter.com/redglassesapps\n# Based on: original script from Eonil (main changes: Eonil's script WILL NOT WORK in Xcode GUI - it WILL CRASH YOUR COMPUTER)\n#\n\nset -e\nset -o pipefail\n\n#################[ Tests: helps workaround any future bugs in Xcode ]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif [ $DEBUG_THIS_SCRIPT = \"true\" ]\nthen\necho \"########### TESTS #############\"\necho \"Use the following variables when debugging this script; note that they may change on recursions\"\necho \"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROOT = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR = $CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR = $BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR = $CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR = $TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n# First, work out the BASESDK version number (NB: Apple ought to report this, but they hide it)\n# (incidental: searching for substrings in sh is a nightmare! Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep -o '\\d\\{1,2\\}\\.\\d\\{1,2\\}$')\n\n# Next, work out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\" ]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nOTHER_ARCH=\"-arch armv7\"\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nOTHER_ARCH=\"-arch x86_64\"\nfi\n\necho \"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION} (although back-targetting: ${IPHONEOS_DEPLOYMENT_TARGET})\"\necho \"...therefore, OTHER_SDK_TO_BUILD = ${OTHER_SDK_TO_BUILD}\"\n#\n#####################[ end of part 1 ]##################\n\n#####################[ part 2 ]##################\n#\n# IF this is the original invocation, invoke WHATEVER other builds are required\n#\n# Xcode is already building ONE target...\n#\n# ...but this is a LIBRARY, so Apple is wrong to set it to build just one.\n# ...we need to build ALL targets\n# ...we MUST NOT re-build the target that is ALREADY being built: Xcode WILL CRASH YOUR COMPUTER if you try this (infinite recursion!)\n#\n#\n# So: build ONLY the missing platforms/configurations.\n\nif [ \"true\" == ${ALREADYINVOKED:-false} ]\nthen\necho \"RECURSION: I am NOT the root invocation, so I'm NOT going to recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode sucks)\nexport ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ... recursing all missing build targets NOW...\"\necho \"RECURSION: ...about to invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\" -project \\\"${PROJECT_NAME}.xcodeproj\\\" -target \\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO\" BUILD_DIR=\\\"${BUILD_DIR}\\\" BUILD_ROOT=\\\"${BUILD_ROOT}\\\"\n\nxcodebuild -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}.xcodeproj\" -target \"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform binaries as a fat binary for each configurations.\n\n# Calculate where the (multiple) built files are coming from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho \"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking simulator build from: ${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho \"...I will output a universal build to: ${CREATING_UNIVERSAL_DIR}\"\n\n# ... remove the products of previous runs of this script\n# NB: this directory is ONLY created by this script - it should be safe to delete!\n\nrm -rf \"${CREATING_UNIVERSAL_DIR}\"\nmkdir \"${CREATING_UNIVERSAL_DIR}\"\n\n#\necho \"About to call: lipo -create -output \\\"${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}\\\" \\\"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\\\" \\\"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\\\"\"\n\nlipo -create -output \"${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}\" \"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\" \"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added: StackOverflow suggestion to also copy \"include\" files\n# (untested, but should work OK)\n#\nif [ -d \"${CURRENTCONFIG_DEVICE_DIR}/usr/local/include\" ]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}/usr/local/include\"\n# * needs to be outside the double quotes?\ncp -r \"${CURRENTCONFIG_DEVICE_DIR}/usr/local/include/\"* \"${CREATING_UNIVERSAL_DIR}/usr/local/include\"\nfi\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
321EAA5E2171EC8700640504 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -3603,7 +3585,6 @@
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
Expand Down Expand Up @@ -3656,7 +3637,6 @@
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down
Loading