Skip to content

Commit da11587

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-7.0' into merge-develop-7.0_19.01.2016
Conflicts: Makefile docs/dictionary/control_st/after.xml docs/dictionary/control_st/before.xml docs/notes/platforms.md ide ide-support/revdeploylibraryios.livecodescript prebuilt/fetch-libraries.sh
2 parents b17e16d + 01c22af commit da11587

20 files changed

+122
-61
lines changed

‎Installer/package.txt‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -628,22 +628,22 @@ component Runtime.iOS
628628
file ios:iphonesimulator8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
629629
file ios:iphonesimulator8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
630630
file ios:iphonesimulator8.4/fontmap as "fontmap"
631-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_1" place
632-
executable ios:iphonesimulator9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
633-
executable ios:iphonesimulator9.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
634-
executable ios:iphonesimulator9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
635-
executable ios:iphonesimulator9.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
636-
executable ios:iphonesimulator9.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
637-
executable ios:iphonesimulator9.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
638-
executable ios:iphonesimulator9.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
639-
executable ios:iphonesimulator9.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
640-
file ios:iphonesimulator9.1/mobile-template.plist as "Settings.plist"
641-
file ios:iphonesimulator9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
642-
file ios:iphonesimulator9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
643-
file ios:iphonesimulator9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
644-
file ios:iphonesimulator9.1/mobile-disable-ats-template.plist as "DisableATS.plist"
645-
file ios:iphonesimulator9.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
646-
file ios:iphonesimulator9.1/fontmap as "fontmap"
631+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_2" place
632+
executable ios:iphonesimulator9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
633+
executable ios:iphonesimulator9.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
634+
executable ios:iphonesimulator9.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
635+
executable ios:iphonesimulator9.2/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
636+
executable ios:iphonesimulator9.2/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
637+
executable ios:iphonesimulator9.2/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
638+
executable ios:iphonesimulator9.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
639+
executable ios:iphonesimulator9.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
640+
file ios:iphonesimulator9.2/mobile-template.plist as "Settings.plist"
641+
file ios:iphonesimulator9.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
642+
file ios:iphonesimulator9.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
643+
file ios:iphonesimulator9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
644+
file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
645+
file ios:iphonesimulator9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
646+
file ios:iphonesimulator9.2/fontmap as "fontmap"
647647
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
648648
executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
649649
executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -686,27 +686,27 @@ component Runtime.iOS
686686
file ios:iphoneos8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
687687
file ios:iphoneos8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
688688
file ios:iphoneos8.4/fontmap as "fontmap"
689-
into "[[ToolsFolder]]/Runtime/iOS/Device-9_1" place
690-
executable ios:iphoneos9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
691-
executable ios:iphoneos9.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
692-
executable ios:iphoneos9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
693-
executable ios:iphoneos9.1/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
694-
executable ios:iphoneos9.1/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
695-
executable ios:iphoneos9.1/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
696-
executable ios:iphoneos9.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
697-
executable ios:iphoneos9.1/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
698-
file ios:iphoneos9.1/mobile-device-template.plist as "Settings.plist"
699-
file ios:iphoneos9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
700-
file ios:iphoneos9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
701-
file ios:iphoneos9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
702-
file ios:iphoneos9.1/template-entitlements.xcent as "Entitlements.xcent"
703-
file ios:iphoneos9.1/template-store-entitlements.xcent as "StoreEntitlements.xcent"
704-
file ios:iphoneos9.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
705-
file ios:iphoneos9.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
706-
file ios:iphoneos9.1/template-ResourceRules.plist as "ResourceRules.plist"
707-
file ios:iphoneos9.1/mobile-disable-ats-template.plist as "DisableATS.plist"
708-
file ios:iphoneos9.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
709-
file ios:iphoneos9.1/fontmap as "fontmap"
689+
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
690+
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
691+
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
692+
executable ios:iphoneos9.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
693+
executable ios:iphoneos9.2/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
694+
executable ios:iphoneos9.2/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
695+
executable ios:iphoneos9.2/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
696+
executable ios:iphoneos9.2/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
697+
executable ios:iphoneos9.2/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
698+
file ios:iphoneos9.2/mobile-device-template.plist as "Settings.plist"
699+
file ios:iphoneos9.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
700+
file ios:iphoneos9.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
701+
file ios:iphoneos9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
702+
file ios:iphoneos9.2/template-entitlements.xcent as "Entitlements.xcent"
703+
file ios:iphoneos9.2/template-store-entitlements.xcent as "StoreEntitlements.xcent"
704+
file ios:iphoneos9.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
705+
file ios:iphoneos9.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
706+
file ios:iphoneos9.2/template-ResourceRules.plist as "ResourceRules.plist"
707+
file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
708+
file ios:iphoneos9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
709+
file ios:iphoneos9.2/fontmap as "fontmap"
710710

711711
////////////////////////////////////////////////////////////////////////////////
712712

‎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 ?= 8.2 8.4 9.1
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.1
28+
IPHONEOS_VERSIONS ?= 8.2 8.4 9.2
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.2
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \

‎docs/dictionary/control_st/after.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Platforms: desktop,server,web,mobile
1515
Example:
1616
after mouseUp
1717
answer "after mouse up received"
18-
end resizeStack
18+
end mouseUp
1919

2020
Parameters:
2121
messageName:

‎docs/dictionary/control_st/before.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Platforms: desktop,server,web,mobile
1515
Example:
1616
before mouseUp
1717
answer "before mouse up received"
18-
end resizeStack
18+
end mouseUp
1919

2020
Parameters:
2121
messageName:

‎docs/notes/bugfix-13277.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# scalefactor doesn't change player size in browse mode

‎docs/notes/bugfix-15706.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Mac - Icons to display on ask and answer dialogs - not showing

‎docs/notes/bugfix-16661.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Dict: "before" and "after" have bad examples

‎docs/notes/platforms.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,17 @@ Currently, the supported versions of Xcode are:
6363
* Xcode 5.1 on MacOS X 10.8
6464
* Xcode 6.2 on MacOS X 10.9
6565
* Xcode 6.2, 6.4 and 7.1 on Mac OS X 10.10
66-
* Xcode 7.1 on MacOS X 10.11
66+
* Xcode 7.2 on MacOS X 10.11
6767

6868
It is also possible to set other versions of Xcode, to allow testing on a wider range of iOS simulators. For instance, on Yosemite, you can add *Xcode 5.1* in the *Mobile Support* preferences, to let you test your stack on the *iOS Simulator 7.1*.
6969

7070
We currently support the following iOS Simulators:
71+
7172
* 6.1
7273
* 7.1
7374
* 8.2
7475
* 8.4
75-
* 9.1
76+
* 9.2
7677

7778
## Android
7879
LiveCode allows you to save your stack as an Android application, and also to deploy it on an Android device or simulator from the IDE.

‎engine/src/mac-av-player.mm‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ static CVReturn MyDisplayLinkCallback (CVDisplayLinkRef displayLink,
127127
uint32_t m_selection_start, m_selection_finish;
128128
uint32_t m_selection_duration;
129129
uint32_t m_buffered_time;
130+
double m_scale;
130131
CMTimeScale m_time_scale;
131132

132133
bool m_play_selection_only : 1;
@@ -286,6 +287,8 @@ - (void)setPlayer:(AVPlayer *)player
286287
m_selection_start = 0;
287288
m_selection_finish = 0;
288289
m_buffered_time = 0;
290+
291+
m_scale = 1.0;
289292

290293
m_time_observer_token = nil;
291294
m_endtime_observer_token = nil;
@@ -834,9 +837,16 @@ - (void)setPlayer:(AVPlayer *)player
834837
MCMacPlatformWindow *t_window;
835838
t_window = (MCMacPlatformWindow *)m_window;
836839

840+
// PM-2015-11-26: [[ Bug 13277 ]] Scale m_rect before mapping
841+
MCRectangle t_rect = m_rect;
842+
t_rect.x *= m_scale;
843+
t_rect.y *= m_scale;
844+
t_rect.width *= m_scale;
845+
t_rect.height *= m_scale;
846+
837847
NSRect t_frame;
838-
t_window -> MapMCRectangleToNSRect(m_rect, t_frame);
839-
848+
t_window -> MapMCRectangleToNSRect(t_rect, t_frame);
849+
840850
m_synchronizing = true;
841851

842852
[m_view setFrame: t_frame];
@@ -1052,6 +1062,10 @@ - (void)setPlayer:(AVPlayer *)player
10521062
case kMCPlatformPlayerPropertyOffscreen:
10531063
Switch(*(bool *)p_value);
10541064
break;
1065+
case kMCPlatformPlayerPropertyScalefactor:
1066+
m_scale = *(double *)p_value;
1067+
Synchronize();
1068+
break;
10551069
case kMCPlatformPlayerPropertyRect:
10561070
m_rect = *(MCRectangle *)p_value;
10571071
Synchronize();
@@ -1248,6 +1262,10 @@ static Boolean AVAssetHasType(AVAsset *p_asset, NSString *p_type)
12481262
case kMCPlatformPlayerPropertyMirrored:
12491263
*(bool *)r_value = m_mirrored;
12501264
break;
1265+
1266+
case kMCPlatformPlayerPropertyScalefactor:
1267+
*(double *)r_value = m_scale;
1268+
break;
12511269
}
12521270
}
12531271

‎engine/src/mac-qt-player.mm‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ - (NSView *) newHitTest: (NSPoint) aPoint;
121121
uint32_t *m_markers;
122122
uindex_t m_marker_count;
123123
uint32_t m_last_marker;
124+
double m_scale;
124125

125126
MCRectangle m_rect;
126127
bool m_visible : 1;
@@ -251,6 +252,7 @@ inline NSComparisonResult do_QTTimeCompare (QTTime time, QTTime otherTime)
251252
m_last_current_time = do_QTMakeTime(INT64_MAX, 1);
252253
m_buffered_time = do_QTMakeTime(0, 1);
253254
m_mirrored = false;
255+
m_scale = 1.0;
254256
}
255257

256258
MCQTKitPlayer::~MCQTKitPlayer(void)
@@ -613,9 +615,16 @@ inline NSComparisonResult do_QTTimeCompare (QTTime time, QTTime otherTime)
613615
MCMacPlatformWindow *t_window;
614616
t_window = (MCMacPlatformWindow *)m_window;
615617

618+
// PM-2015-11-26: [[ Bug 13277 ]] Scale m_rect before mapping
619+
MCRectangle t_rect = m_rect;
620+
t_rect.x *= m_scale;
621+
t_rect.y *= m_scale;
622+
t_rect.width *= m_scale;
623+
t_rect.height *= m_scale;
624+
616625
NSRect t_frame;
617-
t_window -> MapMCRectangleToNSRect(m_rect, t_frame);
618-
626+
t_window -> MapMCRectangleToNSRect(t_rect, t_frame);
627+
619628
m_synchronizing = true;
620629

621630
[m_view setFrame: t_frame];
@@ -736,6 +745,10 @@ inline NSComparisonResult do_QTTimeCompare (QTTime time, QTTime otherTime)
736745
case kMCPlatformPlayerPropertyOffscreen:
737746
Switch(*(bool *)p_value);
738747
break;
748+
case kMCPlatformPlayerPropertyScalefactor:
749+
m_scale = *(double *)p_value;
750+
Synchronize();
751+
break;
739752
case kMCPlatformPlayerPropertyRect:
740753
m_rect = *(MCRectangle *)p_value;
741754
Synchronize();
@@ -950,6 +963,10 @@ static Boolean QTMovieHasType(Movie tmovie, OSType movtype)
950963
case kMCPlatformPlayerPropertyMirrored:
951964
*(bool *)r_value = m_mirrored;
952965
break;
966+
967+
case kMCPlatformPlayerPropertyScalefactor:
968+
*(double *)r_value = m_scale;
969+
break;
953970
}
954971
}
955972

0 commit comments

Comments
 (0)