Merge branch 'develop-6.7' into develop-7.0

livecodesebastien · livecodesebastien · commit bed1f8986a88 · 2014-11-11T18:35:06.000Z
Conflicts:
	engine/src/desktop-menu.cpp
	engine/src/ide.cpp
	engine/src/mac-menu.mm
diff --git a/docs/notes/bugfix-13900.md b/docs/notes/bugfix-13900.md
@@ -0,0 +1 @@
+# Deleting whitespace at beginning of a script is buggy
diff --git a/docs/notes/bugfix-13914.md b/docs/notes/bugfix-13914.md
@@ -0,0 +1 @@
+# Standards menus can't be translated
diff --git a/docs/notes/bugfix-13919.md b/docs/notes/bugfix-13919.md
@@ -0,0 +1 @@
+# LiveCode server unable to find handlers in script only stack
diff --git a/docs/notes/bugfix-13950.md b/docs/notes/bugfix-13950.md
@@ -0,0 +1 @@
+#    audioClip looping cannot be stopped 
diff --git a/docs/notes/bugfix-13968.md b/docs/notes/bugfix-13968.md
@@ -0,0 +1 @@
+#     [[Player]] Looping does not work within selection
diff --git a/docs/notes/bugfix-13970.md b/docs/notes/bugfix-13970.md
@@ -0,0 +1 @@
+#     export snapshot not working as expected for video snapshot exports
diff --git a/docs/notes/bugfix-13974.md b/docs/notes/bugfix-13974.md
@@ -0,0 +1 @@
+# within(object,point) is mostly wrong
diff --git a/docs/notes/bugfix-13979.md b/docs/notes/bugfix-13979.md
@@ -0,0 +1 @@
+#     MobilePickContact always returns empty in iOS8
diff --git a/engine/src/aclip.cpp b/engine/src/aclip.cpp
@@ -174,11 +174,15 @@ const char *MCAudioClip::gettypestring()
 
 void MCAudioClip::timer(MCNameRef mptr, MCParameter *params)
 {
-	if (play())
-    {
+    // PM-2014-11-11: [[ Bug 13950 ]] Make sure looping audioClip can be stopped
 #ifndef FEATURE_PLATFORM_AUDIO
-		MCscreen->addtimer(this, MCM_internal, looping ? LOOP_RATE: PLAY_RATE);
+    if (play())
+    {
+        MCscreen->addtimer(this, MCM_internal, looping ? LOOP_RATE: PLAY_RATE);
 #else
+    if (MCPlatformSoundIsPlaying(s_current_sound))
+    {
+        // Do nothing
 #endif
     }
 	else
diff --git a/engine/src/desktop-menu.cpp b/engine/src/desktop-menu.cpp
@@ -886,28 +886,36 @@ void MCPlatformHandleMenuUpdate(MCPlatformMenuRef p_menu)
 	uindex_t t_parent_menu_index;
 	MCPlatformGetMenuParent(p_menu, t_parent_menu, t_parent_menu_index);
 	
-	// If the parent menu is not the menubar, we aren't interested.
-	if (t_parent_menu != s_menubar)
-		return;
+    // SN-2014-11-10: [[ Bug 13836 ]] We can also be the menubar's LiveCode item - in which case an
+    //  update is allowed as well
+    bool t_update_menubar;
+    t_update_menubar = p_menu == s_menubar;
+    
+    // If the parent menu is not the menubar, we aren't interested.
+    if (t_parent_menu != s_menubar && !t_update_menubar)
+        return;
 	
 	// If the button it is 'attached' to still exists, dispatch the menu update
 	// message (currently mouseDown("")). We do this whilst the menubar is locked
 	// from updates as we mustn't fiddle about with it too much in this case!
-	if (s_menubar_targets[t_parent_menu_index] -> Exists())
+	if (t_update_menubar || s_menubar_targets[t_parent_menu_index] -> Exists())
 	{
         // MW-2014-06-10: [[ Bug 12590 ]] Make sure we lock screen around the menu update message.
         MCRedrawLockScreen();
-		s_menubar_lock_count += 1;
-        // SN-2014-11-06: [[ Bug 13940 ]] Keep the behaviour as previously: mouseDown "" is sent when updating menus
-		s_menubar_targets[t_parent_menu_index] -> Get() -> message_with_valueref_args(MCM_mouse_down, MCSTR(""));
-
+        s_menubar_lock_count += 1;
+        // SN-2014-11-06: [[ Bug 13836 ]] MCmenubar (or MCdefaultmenubar) should get mouseDown, not the target (it gets menuPick)
+        if (MCmenubar != nil)
+            MCmenubar -> message_with_valueref_args(MCM_mouse_down, MCSTR("1"));
+        else if (MCdefaultmenubar != nil)
+            MCdefaultmenubar -> message_with_valueref_args(MCM_mouse_down, MCSTR("1"));
 		s_menubar_lock_count -= 1;
         MCRedrawUnlockScreen();
 	}
 	
+    // SN-2014-11-10: [[ Bug 13836 ]] Make sure that
 	// Now we've got the menu to update, process the new menu spec, but only if the
 	// menu button still exists!
-	if (s_menubar_targets[t_parent_menu_index] -> Exists())
+	if (!t_update_menubar && s_menubar_targets[t_parent_menu_index] -> Exists())
 	{
 		MCButton *t_button;
 		t_button = (MCButton *)s_menubar_targets[t_parent_menu_index] -> Get();
diff --git a/engine/src/graphic.cpp b/engine/src/graphic.cpp
@@ -876,8 +876,11 @@ bool MCGraphic::get_points_for_regular_polygon(MCPoint*& r_points, uint2& r_poin
 		fakepoint.y = cy + (int2)(sin(iangle) * dy);
 		r_points[i] = fakepoint;
 	}
-	r_points[nsides] = fakepoint;
-	r_point_count = nsides;
+    
+    // SN-2014-11-11: [[ Bug 13974 ]] The last side is linked to the first point, for a
+    // regular polygon.
+	r_points[nsides] = r_points[0];
+	r_point_count = nsides + 1;
 	return (true);
 }
 
diff --git a/engine/src/ide.cpp b/engine/src/ide.cpp
@@ -1843,8 +1843,13 @@ void MCIdeScriptReplace::exec_ctxt(MCExecContext & ctxt)
 
         // MW-2014-10-24: [[ Bug 13598 ]] If we are passed (0,0) then treat this as (1,1) - i.e
         //   first char of field.
-        if (t_start_index == 0 && t_end_index == 0)
-            t_start_index = 1, t_end_index = 1;
+        // SN-2014-11-11: [[ Bug 13900 ]] We want to avoid any issue with a 0 start index.
+        //  If we get so, that was given for the first line, and the end index is offset by 1 as well.
+        if (t_start_index == 0)
+        {
+            t_start_index = 1;
+            t_end_index++;
+        }
 
         t_start_index -= 1;
 
@@ -1886,10 +1891,13 @@ void MCIdeScriptReplace::exec_ctxt(MCExecContext & ctxt)
     t_start_index = t_start;
     t_end_index = t_end;
 
-    // MW-2014-10-24: [[ Bug 13598 ]] If we are passed (0,0) then treat this as (1,1) - i.e
-    //   first char of field.
-    if (t_start_index == 0 && t_end_index == 0)
-        t_start_index = 1, t_end_index = 1;
+    // SN-2014-11-11: [[ Bug 13900 ]] We want to avoid any issue with a 0 start index.
+    //  If we get so, that was given for the first line, and the end index is offset by 1 as well.
+    if (t_start_index == 0)
+    {
+        t_start_index = 1;
+        t_end_index++;
+    }
     
     t_start_index -= 1;
 
diff --git a/engine/src/mac-av-player.mm b/engine/src/mac-av-player.mm
@@ -841,6 +841,8 @@ - (void)setPlayer:(AVPlayer *)player
                                                                        queue: nil usingBlock: ^(void) {
                                                                            [m_player pause];
                                                                            [m_player seekToTime: t_original_end_time toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero];
+                                                                           // PM-2014-11-10: [[ Bug 13968 ]] Make sure we loop within start and finish time when playSelection is true 
+                                                                           MovieFinished();
                                                                        }];
     }
     
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
diff --git a/engine/src/mbliphonecontact.mm b/engine/src/mbliphonecontact.mm
diff --git a/engine/src/mode_server.cpp b/engine/src/mode_server.cpp
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
diff --git a/ide b/ide

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Deleting whitespace at beginning of a script is buggy`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# LiveCode server unable to find handlers in script only stack`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [[Player]] Looping does not work within selection`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# export snapshot not working as expected for video snapshot exports`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# MobilePickContact always returns empty in iOS8`