Skip to content

Commit fcbbe45

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop-9.0' of https://github.com/livecode/livecode into bugfix-20211
2 parents b8d6f0b + 1c8bbd7 commit fcbbe45

9 files changed

Lines changed: 29 additions & 8 deletions

‎docs/notes/bugfix-20839-2.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Improve appearance of disabled buttons when using Motif look-and-feel

‎docs/notes/bugfix-21395.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix MacOSX player control not starting when playRate property is 0

‎docs/notes/bugfix-21398.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Do not split up .framework folders between MacOS and Resources/_MacOS folder

‎engine/src/buttondraw.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
109109
bool t_isvista = MCmajorosversion >= 0x0600 && MCcurtheme != NULL;
110110

111111
bool t_themed_menu = false;
112+
bool t_use_alpha_layer = false;
112113

113114
if (entry != NULL)
114115
{
@@ -352,7 +353,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
352353
if (MClook == LF_MOTIF)
353354
{
354355
setforeground(dc, DI_FORE, False);
355-
dc->setfillstyle(FillStippled, nil, 0, 0);
356+
dc->setopacity(127);
357+
dc->begin(false);
358+
t_use_alpha_layer = true;
356359
}
357360
else if (IsMacLF())
358361
{
@@ -576,6 +579,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
576579
MCStringRef t_name = MCNameGetString(getname());
577580
drawdirectionaltext(dc, rect.x + leftmargin, starty, t_name, m_font);
578581
}
582+
583+
if (t_use_alpha_layer)
584+
dc->end();
579585

580586
// MW-2012-01-27: [[ Bug 9432 ]] Native GTK handles focus borders itself
581587
// so don't render the win95-style one.
@@ -1608,7 +1614,7 @@ void MCButton::drawtabs(MCDC *dc, MCRectangle &srect)
16081614
{
16091615
case LF_MOTIF:
16101616
setforeground(dc, DI_FORE, False);
1611-
dc->setfillstyle(FillStippled, nil, 0, 0);
1617+
dc->setopacity(127);
16121618
break;
16131619
case LF_MAC:
16141620
dc->setforeground(dc->getgray());

‎engine/src/globals.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,8 @@ void X_clear_globals(void)
856856

857857
MChooks = nil;
858858

859+
memset(&MClicenseparameters, 0, sizeof(MCLicenseParameters));
860+
859861
#if defined(MCSSL)
860862
MCSocketsInitialize();
861863
#endif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ - (void)setPlayer:(AVPlayer *)player
317317
m_buffered_time = 0;
318318

319319
m_scale = 1.0;
320-
m_rate = 0.0;
321-
320+
m_rate = 1.0;
321+
322322
m_time_observer_token = nil;
323323
m_endtime_observer_token = nil;
324324

‎engine/src/player-platform.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,10 +1386,17 @@ void MCPlayer::setplayrate()
13861386
{
13871387
if (m_platform_player != nil && hasfilename())
13881388
{
1389-
MCPlatformSetPlayerProperty(m_platform_player, kMCPlatformPlayerPropertyPlayRate, kMCPlatformPropertyTypeDouble, &rate);
1390-
if (rate != 0.0f)
1391-
// PM-2014-05-28: [[ Bug 12523 ]] Take into account the playRate property
1389+
if (rate == 0.0f)
1390+
{
1391+
// Setting playrate to 0 should pause the player (if playing)
1392+
MCPlatformStopPlayer(m_platform_player);
1393+
}
1394+
else
1395+
{
1396+
// start / resume at the new rate
1397+
MCPlatformSetPlayerProperty(m_platform_player, kMCPlatformPlayerPropertyPlayRate, kMCPlatformPropertyTypeDouble, &rate);
13921398
MCPlatformStartPlayer(m_platform_player, rate);
1399+
}
13931400
}
13941401

13951402
if (rate != 0)

‎ide-support/revsaveasandroidstandalone.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ private function addExternalFromFile pExternal, pClassesFolder, pLibsFolder
12781278

12791279
repeat for each word tArch in kArchs
12801280
local tPattern
1281-
put "^(?:External-" & tArch & "|lib.+" & tArch & "\.so)$" into tPattern
1281+
put "^Android/(?:External-" & tArch & "|lib.+" & tArch & "\.so)$" into tPattern
12821282
filter tZipItems with regex pattern tPattern into tZipItemsFiltered
12831283
put pLibsFolder & slash & tArch & slash & "lib" & tExternalName & ".so" into tLibFileA[tArch]
12841284

‎ide-support/revsaveasstandalone.livecodescript‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,6 +2563,9 @@ command revRedirectMacOSResourcesRecurse pSourceFolder, pTargetFolder
25632563
if tFolder ends with ".app" then
25642564
next repeat
25652565
end if
2566+
if tFolder ends with ".framework" then
2567+
next repeat
2568+
end if
25662569
revRedirectMacOSResourcesRecurse pSourceFolder & slash & tFolder, pTargetFolder & slash & tFolder
25672570
end repeat
25682571

0 commit comments

Comments
 (0)