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

Commit 9d7fc86

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1-17.04.2018
2 parents a0245ce + 3df3b76 commit 9d7fc86

28 files changed

+287
-47
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,22 @@ component Runtime.iOS
684684
file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
685685
file ios:iphonesimulator11.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
686686
file ios:iphonesimulator11.2/fontmap as "fontmap"
687+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_3" place
688+
executable ios:iphonesimulator11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
689+
executable ios:iphonesimulator11.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
690+
executable ios:iphonesimulator11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
691+
executable ios:iphonesimulator11.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
692+
executable ios:iphonesimulator11.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
693+
executable ios:iphonesimulator11.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
694+
executable ios:iphonesimulator11.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
695+
executable ios:iphonesimulator11.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
696+
file ios:iphonesimulator11.3/mobile-template.plist as "Settings.plist"
697+
file ios:iphonesimulator11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
698+
file ios:iphonesimulator11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
699+
file ios:iphonesimulator11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
700+
file ios:iphonesimulator11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
701+
file ios:iphonesimulator11.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
702+
file ios:iphonesimulator11.3/fontmap as "fontmap"
687703
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
688704
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
689705
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -744,6 +760,26 @@ component Runtime.iOS
744760
file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
745761
file ios:iphoneos11.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
746762
file ios:iphoneos11.2/fontmap as "fontmap"
763+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_3" place
764+
executable ios:iphoneos11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
765+
executable ios:iphoneos11.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
766+
executable ios:iphoneos11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
767+
executable ios:iphoneos11.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
768+
executable ios:iphoneos11.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
769+
executable ios:iphoneos11.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
770+
executable ios:iphoneos11.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
771+
executable ios:iphoneos11.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
772+
file ios:iphoneos11.3/mobile-device-template.plist as "Settings.plist"
773+
file ios:iphoneos11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
774+
file ios:iphoneos11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
775+
file ios:iphoneos11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
776+
file ios:iphoneos11.3/template-entitlements.xcent as "Entitlements.xcent"
777+
file ios:iphoneos11.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
778+
file ios:iphoneos11.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
779+
file ios:iphoneos11.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
780+
file ios:iphoneos11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
781+
file ios:iphoneos11.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
782+
file ios:iphoneos11.3/fontmap as "fontmap"
747783

748784
////////////////////////////////////////////////////////////////////////////////
749785

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 11.3
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 11.3
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \

‎buildbot.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45+
'universal-ios-iphoneos11.3',
4546
'universal-ios-iphoneos11.2',
4647
'universal-ios-iphoneos10.2',
4748
'universal-ios-iphoneos9.2',
49+
'universal-ios-iphonesimulator11.3',
4850
'universal-ios-iphonesimulator11.2',
4951
'universal-ios-iphonesimulator10.2',
5052
'universal-ios-iphonesimulator9.2',

‎builder/builder_utilities.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2018-3-2"
4-
constant kTSNetVersion = "1.3.4"
3+
constant kMergExtVersion = "2018-4-4"
4+
constant kTSNetVersion = "1.3.5"
55

66
local sEngineDir
77
local sWorkDir

‎docs/dictionary/command/mobileSetAllowedOrientations.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,4 @@ the configured list.
4949
References: mobileLockOrientation (command),
5050
mobileUnlockOrientation (command), mobileAllowedOrientations (function),
5151
mobileDeviceOrientation (function), mobileOrientation (function),
52-
orientationChanged (message)
53-
52+
orientationChanged (message), mobileSetFullScreenRectForOrientations (command)

‎docs/dictionary/command/mobileSetFullScreenRectForOrientations.lcdoc‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
Name: mobileSetFullScreenRectForOrientations
2+
3+
Type: command
4+
5+
Syntax: mobileSetFullScreenRectForOrientations <orientations>[, <rect>]
6+
7+
Summary:
8+
Set the list of allowed orientations.
9+
10+
Introduced: 8.1.10
11+
12+
OS: ios, android
13+
14+
Platforms: mobile
15+
16+
Example:
17+
mobileSetFullScreenRectForOrientations "portrait,portrait upside down","0,0,375,667"
18+
mobileSetFullScreenRectForOrientations "landscape left,landscape right","0,0,667,375"
19+
20+
Parameters:
21+
orientations (enum):
22+
A comma delimited list consisting of at least one of:
23+
24+
- "portrait"
25+
- "portrait upside down"
26+
- "landscape left"
27+
- "landscape right"
28+
29+
rect:
30+
A comma delimited rect for the stack to be set to. If not set the rect for
31+
the specified orientations will be cleared.
32+
33+
34+
Description:
35+
Use the <mobileSetFullScreenRectForOrientations> command to set the rect
36+
to resize the stack to when the orientation changes and the stack has its
37+
<fullscreenMode> set.
38+
39+
Normally when a <fullscreenMode> is set the stack is not resized and does
40+
receive the <resizeStack> message. The rect is set after the <orientationChanged>
41+
message is sent. If the rect for the new orientation is different to the
42+
current stack rect the <resizeStack> message will be sent once the new
43+
rect is applied.
44+
45+
The setting take affect the next time an orientation change is applied.
46+
The interface orientation only changes if the new orientation is among
47+
the <mobileAllowedOrientations>.
48+
49+
>*Note:* Due to the limitation of the Android operating system,
50+
> landscape left and portrait upside-down are only supported on Android
51+
> 2.3 and later.
52+
53+
References: mobileLockOrientation (command), mobileSetAllowedOrientations (command),
54+
mobileUnlockOrientation (command), mobileAllowedOrientations (function),
55+
mobileDeviceOrientation (function), mobileOrientation (function),
56+
orientationChanged (message), resizeStack (message)

‎docs/dictionary/function/mobileAllowedOrientations.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ of the orientations the application supports.
4242
References: mobileSetAllowedOrientations (command),
4343
mobileLockOrientation (command), mobileUnlockOrientation (command),
4444
mobileDeviceOrientation (function), mobileOrientation (function),
45-
orientationChanged (message)
46-
45+
orientationChanged (message), mobileSetFullScreenRectForOrientations (command)

‎docs/dictionary/function/mobileOrientation.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,4 @@ interface.
4545
References: mobileSetAllowedOrientations (command),
4646
mobileLockOrientation (command), mobileUnlockOrientation (command),
4747
mobileDeviceOrientation (function), mobileAllowedOrientations (function),
48-
orientationChanged (message)
49-
48+
orientationChanged (message), mobileSetFullScreenRectForOrientations (command)

‎docs/dictionary/message/orientationChanged.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,4 @@ milliseconds(command)> command.
4141
References: mobileSetAllowedOrientations (command),
4242
mobileLockOrientation (command), mobileUnlockOrientation (command),
4343
mobileAllowedOrientations (function), mobileDeviceOrientation (function),
44-
mobileOrientation (function), resizeStack (message)
45-
44+
mobileOrientation (function), resizeStack (message), mobileSetFullScreenRectForOrientations (command)

‎docs/dictionary/message/touchMove.lcdoc‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@ OS: ios, android
1414
Platforms: mobile
1515

1616
Example:
17-
on touchMove pTouchID, pX, pY
18-
if pX &gt; lastX then
19-
-- user has moved to the right
17+
local sLastX
18+
on touchMove pTouchID, pTouchX, pTouchY
19+
-- sLastX[pTouchID] will be empty when the first move
20+
-- message for pTouchID is sent
21+
if sLastX[pTouchID] is not empty and \
22+
pTouchX > sLastX[pTouchID] then
23+
-- user has moved to the right
2024
end if
25+
put pTouchX into sLastX[pTouchID]
2126
end touchMove
2227

2328
Parameters:
@@ -30,14 +35,14 @@ pTouchX:
3035
The horizontal coordinate of the touchPosition
3136

3237
pTouchY:
33-
The vertical coordinate of the touchPostition
38+
The vertical coordinate of the touchPosition
3439

3540
Description:
3641
Handle the <touchMove> message if you want to perform some action when
3742
the user changes the touch position without ending the touch or if you
3843
want to keep continuous track of the touch position.
3944

40-
The <touchMove> message is sent to the control which recived the
45+
The <touchMove> message is sent to the control which received the
4146
<touchStart> message to begin the touch sequence.
4247

4348
The <pTouchID> parameter is a number which uniquely identifies a sequence
@@ -49,7 +54,7 @@ or more <touchMove> messages and finish with either a <touchEnd> or a
4954
No two touch sequences will have the same id, and it is possible to have
5055
multiple (interleaving) such sequences occurring at once. This allows
5156
handling of more than one physical touch at once and, for example,
52-
allows you to track two fingers moving on the iPhone's screen.
57+
allows you to track two fingers moving on the device screen.
5358

5459
The sequence of touch messages is tied to the control in which the touch
5560
started, in much the same way mouse messages are tied to the object a
@@ -58,6 +63,10 @@ starts in is identical to that used to determine whether the pointer is
5863
inside a control. In particular, invisible and disabled controls will
5964
not considered viable candidates.
6065

66+
Since the current touch position is reported for each move message, the
67+
previous position will need to be tracked to calculate direction and/or
68+
distance moved.
69+
6170
References: touchRelease (message), touchStart (message),
6271
touchEnd (message)
6372

0 commit comments

Comments
 (0)