Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Merge develop 9.5 27.09.2019 #7182

Merged
livecodepanos merged 15 commits into from
Oct 1, 2019
Merged

Merge develop 9.5 27.09.2019 #7182

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f287675
[Bugfix-21822] drawingSvgCompileFile() can't read from Android resour…
Aug 30, 2019
4656537
Update drawing.livecodescript
Aug 30, 2019
c65c861
[Bugfix-19892] Clarify reverse play behaviour for playStopped
Sep 19, 2019
c8233b5
[Bugfix-19377] Edit version comparison example to work beyond LC 9
Sep 19, 2019
7a54c30
< to &lt;
Sep 19, 2019
be64c73
Update bugfix-19377.md
Sep 20, 2019
92bcb00
Update playStopped.lcdoc
Sep 26, 2019
2fad6f0
Delete bugfix-21822.md
Sep 26, 2019
daf5a93
Create 21822.md
Sep 26, 2019
f2e6b48
Merge pull request #7170 from livecodesam/bugfix-19377
livecodepanos Sep 26, 2019
51cff84
Merge pull request #7169 from livecodesam/bugfix-19892
livecodepanos Sep 26, 2019
cd0738e
Merge pull request #7151 from livecodesam/bugfix_21822
livecodepanos Sep 26, 2019
ea7eea4
[iOS 13.1] Fixed typo in package.txt
livecodepanos Sep 27, 2019
bc04612
Merge pull request #7181 from livecodepanos/ios13.1_tweaks
livecodepanos Sep 27, 2019
8133251
Merge remote-tracking branch 'upstream/develop-9.5' into merge-develo…
livecodepanos Sep 27, 2019
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
28 changes: 20 additions & 8 deletions extensions/script-libraries/drawing/drawing.livecodescript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,20 @@ Finally if the width and height are not specified, or are percentages and there
is no viewBox attribute then the intrinsic width and height are taken to be
256.

Note: The drawing binary format is not currently considered stable and is
>*Note:* The drawing binary format is not currently considered stable and is
subject to change until the end of the RC cycle for 9. At present it is advised
that SVG files be compiled as needed when developing in the IDE, and then
compiled ahead-of-time when building a standalone.

Note: To use this function in a standalone, you must include the XML extension.

>*Note:* To use this function in a standalone, you must include the XML
extension.


>*Note:* The <XML library> (and by extension, this function) can not load
> files from the resources folder on Android. You must either copy the
> resources to the documents folder or use the <drawingSvgCompile>
> function instead.

Parameters:

Expand All @@ -132,7 +140,7 @@ of an image directly.
The result:
An error string if an error occurred.

References: drawingSvgCompile (function)
References: drawingSvgCompile (function), XML library (library)
*/
function drawingSvgCompileFile pXmlFile
/* Convert the XML file to the LiveCode array structure. */
Expand Down Expand Up @@ -208,12 +216,16 @@ Finally if the width and height are not specified, or are percentages and there
is no viewBox attribute then the intrinsic width and height are taken to be
256.

Note: The drawing binary format is not currently considered stable and is
subject to change until the end of the RC cycle for 9. At present it is advised
that SVG files be compiled as needed when developing in the IDE, and then
compiled ahead-of-time when building a standalone.
>*Note:* The drawing binary format is not currently considered stable and is
> subject to change until the end of the RC cycle for 9. At present it is advised
> that SVG files be compiled as needed when developing in the IDE, and then
> compiled ahead-of-time when building a standalone.


>*Note:* To use this function in a standalone, you must include the XML
> extension.


Note: To use this function in a standalone, you must include the XML extension.
Parameters:

pXmlText (string):
Expand Down
1 change: 1 addition & 0 deletions extensions/script-libraries/drawing/notes/21822.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# [21822] Added a note mentioning that drawingSvgCompileFile() can not read from the resources folder on Android