Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0

livecodesebastien · livecodesebastien · commit 7d52934da9f0 · 2015-11-06T15:55:17.000Z
The changes to review are the one listed in 'Conflicts' and 'Changes to be committed' lists:
Others have been successfully merged in.

Conflicts:
	engine/src/paragraf.cpp

Changes to be committed:
	modified:   engine/src/exec-interface.cpp
	modified:   engine/src/paragraf.cpp
diff --git a/docs/notes/bugfix-16177.md b/docs/notes/bugfix-16177.md
@@ -0,0 +1 @@
+#   stack height keeps being changed between LC sessions
diff --git a/docs/notes/bugfix-16218.md b/docs/notes/bugfix-16218.md
@@ -0,0 +1 @@
+# Popup menu can get corrupted when click-drag out of the list
diff --git a/docs/notes/bugfix-16221.md b/docs/notes/bugfix-16221.md
@@ -0,0 +1 @@
+# Hiliting lines in a field are not accurate or working correctly with word selection
diff --git a/docs/notes/bugfix-16283.md b/docs/notes/bugfix-16283.md
@@ -0,0 +1 @@
+#  create script only stack doesn't automatically update Project Browser
diff --git a/docs/notes/bugfix-16284.md b/docs/notes/bugfix-16284.md
@@ -0,0 +1 @@
+# First iOS standalone build with Xcode 7.0/7.1 causes "linking for arm" error
diff --git a/engine/src/cmdsc.cpp b/engine/src/cmdsc.cpp
@@ -1097,6 +1097,8 @@ void MCCreate::exec_ctxt(MCExecContext& ctxt)
         t_new_stack -> setparent(MCdispatcher -> gethome());
         t_new_stack -> message(MCM_new_stack);
         t_new_stack -> setflag(False, F_VISIBLE);
+		// PM-2015-10-26: [[ Bug 16283 ]] Automatically update project browser to show newly created script only stacks
+		t_new_stack -> open();
         ep . clear();
         t_new_stack -> setasscriptonly(ep);
         optr = t_new_stack;
diff --git a/engine/src/desktop-dc.cpp b/engine/src/desktop-dc.cpp
@@ -255,7 +255,7 @@ bool MCScreenDC::platform_getdisplays(bool p_effective, MCDisplay *& r_displays,
 	return true;
 }
 
-void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode mode)
+void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode mode, Boolean resizable)
 {
 	MCRectangle srect;
 	
@@ -298,7 +298,8 @@ void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mod
 		rect.x = srect . x;
 	if (rect.x + rect.width > srect.x + srect . width - sr)
 	{
-		if (rect.width > srect . width - sw)
+		// PM-2015-10-12: [[ Bug 16177 ]] Modify stack's rect only if stack is resizable
+		if (rect.width > srect . width - sw && resizable)
 			rect.width = srect . width - sw;
 		rect.x = srect . x + srect . width - rect.width - sr;
 	}
@@ -307,7 +308,8 @@ void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mod
 		rect.y = srect.y;
 	if (rect.y + rect.height > srect . y + srect . height - sb)
 	{
-		if (rect.height > srect . height - sh)
+		// PM-2015-10-12: [[ Bug 16177 ]] Modify stack's rect only if stack is resizable
+		if (rect.height > srect . height - sh && resizable)
 			rect.height = srect . height - sh;
 		rect.y = srect . y + srect . height - rect.height - sb;
 	}
diff --git a/engine/src/desktop-dc.h b/engine/src/desktop-dc.h
@@ -80,7 +80,7 @@ class MCScreenDC: public MCUIDC
 	virtual uint16_t platform_getwidth(void);
 	virtual uint16_t platform_getheight(void);
 	virtual bool platform_getdisplays(bool p_effective, MCDisplay *&r_displays, uint32_t &r_count);
-	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m);
+	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable);
 	
 	virtual void resetcursors();
 	virtual void setcursor(Window w, MCCursorRef c);
diff --git a/engine/src/exec-interface.cpp b/engine/src/exec-interface.cpp
@@ -3015,6 +3015,8 @@ void MCInterfaceExecCreateScriptOnlyStack(MCExecContext& ctxt, MCStringRef p_new
     t_new_stack -> setparent(MCdispatcher -> gethome());
     t_new_stack -> message(MCM_new_stack);
     t_new_stack -> setflag(False, F_VISIBLE);
+    // PM-2015-10-26: [[ Bug 16283 ]] Automatically update project browser to show newly created script only stacks
+    t_new_stack -> open();
     t_new_stack -> setasscriptonly(kMCEmptyString);
     
 	if (p_new_name != nil)
diff --git a/engine/src/lnxdc.h b/engine/src/lnxdc.h
@@ -255,7 +255,7 @@ class MCScreenDC : public MCUIDC
 	virtual uint16_t platform_getheight(void);
 	virtual bool platform_getdisplays(bool p_effective, MCDisplay *&r_displays, uint32_t &r_count);
 	virtual bool platform_getwindowgeometry(Window w, MCRectangle &drect);
-	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m);
+	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable);
 	virtual void platform_querymouse(int16_t &r_x, int16_t &r_y);
 	virtual void platform_setmouse(int16_t p_x, int16_t p_y);
 	
diff --git a/engine/src/lnxdce.cpp b/engine/src/lnxdce.cpp
@@ -51,7 +51,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #define WM_TITLE_HEIGHT 16
 
 // IM-2014-01-29: [[ HiDPI ]] Placeholder method for Linux HiDPI support
-void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m)
+void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable)
 {
 	device_boundrect(rect, title, m);
 }
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -40,6 +40,10 @@
 // SN-2014-11-10: [[ Bug 13836 ]] Keeps the track about the open items in the menu bar.
 static uint32_t s_open_menubar_items = 0;
 
+// SN-2015-11-02: [[ Bug 16218 ]] We can't trust popUpMenuPositioningItem on
+//  returning whether an item has been selected.
+static bool s_menu_item_selected = false;
+
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -203,7 +207,10 @@ - (void)menuItemSelected: (id)sender
         t_quit_accelerator_present = [(com_runrev_livecode_MCMenuDelegate *)[[t_item menu] delegate] platformMenuRef] -> quit_item != nil;
     
 	if (s_menu_select_lock == 0 || t_quit_accelerator_present)
+    {
 		MCPlatformCallbackSendMenuSelect(m_menu, [[t_item menu] indexOfItem: t_item]);
+        s_menu_item_selected = true;
+    }
     
     // SN-2014-11-06: [[ Bug 13836 ]] s_menu_select_occured was not used.
 }
@@ -863,12 +870,17 @@ bool MCPlatformPopUpMenu(MCPlatformMenuRef p_menu, MCPlatformWindowRef p_window,
     
     // MW-2014-07-29: [[ Bug 12990 ]] If item is UINDEX_MAX then don't specify an item, thus preventing
     //   one from being highlighted.
-	bool t_result;
-	t_result = [t_menu popUpMenuPositioningItem: p_item == UINDEX_MAX ? nil : [t_menu itemAtIndex: p_item] atLocation: t_location inView: t_view];
+    
+    // SN-2015-11-02: [[ Bug 16218 ]] popUpMenuPositioningItem always returns
+    // true if the menu is open by keeping the mouse down, even if the mouse is
+    // released outside of the menu list.
+    // We will set s_menu_item_selected in menuItemSelected if selection occurs.
+    s_menu_item_selected = false;
+	[t_menu popUpMenuPositioningItem: p_item == UINDEX_MAX ? nil : [t_menu itemAtIndex: p_item] atLocation: t_location inView: t_view];
 	
 	MCMacPlatformSyncMouseAfterTracking();
 	
-	return t_result;
+	return s_menu_item_selected;
 }
 
 //////////
diff --git a/engine/src/mbldc.cpp b/engine/src/mbldc.cpp
@@ -943,7 +943,7 @@ void MCScreenDC::platform_setmouse(int16_t p_x, int16_t p_y)
 	device_setmouse(t_loc.x, t_loc.y);
 }
 
-void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m)
+void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable)
 {
 	MCRectangle t_rect;
 	t_rect = rect;
diff --git a/engine/src/mbldc.h b/engine/src/mbldc.h
@@ -77,7 +77,7 @@ class MCScreenDC: public MCUIDC
 	virtual bool platform_getdisplays(bool p_effective, MCDisplay *&r_displays, uint32_t &r_count);
 	virtual bool platform_displayinfocacheable(void);
 	virtual bool platform_getwindowgeometry(Window w, MCRectangle &drect);
-	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m);
+	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable);
 	virtual void platform_querymouse(int16_t &r_x, int16_t &r_y);
 	virtual void platform_setmouse(int16_t p_x, int16_t p_y);
 	
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -3140,9 +3140,11 @@ int2 MCParagraph::setfocus(int4 x, int4 y, uint2 fixedheight,
 					// It rounds originalindex up to the end of the word it is in.
 					// It then rounds focusedindex down to the beginning of the
 					// previous word.
-					bptr = indextoblock(originalindex, False);
-					if (originalindex < gettextlength() && !TextIsWordBreak(GetCodepointAtIndex(originalindex)))
-						originalindex = findwordbreakafter(bptr, originalindex);
+                    // The first time we are moving backwards, originalindex is
+                    // at the beginning of the word and endindex at the end.
+                    // We simply move originalindex to endindex
+                    if (originalindex < endindex)
+                        originalindex = endindex;
 
 					bptr = indextoblock(focusedindex, False);
 					focusedindex = findwordbreakbefore(bptr, focusedindex);
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -2411,7 +2411,7 @@ Exec_stat MCStack::openrect(const MCRectangle &rel, Window_mode wm, MCStack *par
 	// "bind" the stack's rect... Or in other words, make sure its within the 
 	// screens (well viewports) working area.
 	if (!(flags & F_FORMAT_FOR_PRINTING) && !(state & CS_BEEN_MOVED))
-		MCscreen->boundrect(rect, (!(flags & F_DECORATIONS) || decorations & WD_TITLE), mode);
+		MCscreen->boundrect(rect, (!(flags & F_DECORATIONS) || decorations & WD_TITLE), mode, getflag(F_RESIZABLE));
 	
 	state |= CS_NO_FOCUS;
 	if (flags & F_DYNAMIC_PATHS)
diff --git a/engine/src/uidc.cpp b/engine/src/uidc.cpp
@@ -604,14 +604,14 @@ bool MCUIDC::platform_getwindowgeometry(Window p_window, MCRectangle &r_rect)
 ////////////////////////////////////////////////////////////////////////////////
 
 // IM-2014-01-24: [[ HiDPI ]] Change to use logical coordinates - device coordinate conversion no longer needed
-void MCUIDC::boundrect(MCRectangle &x_rect, Boolean p_title, Window_mode p_mode)
+void MCUIDC::boundrect(MCRectangle &x_rect, Boolean p_title, Window_mode p_mode, Boolean p_resizable)
 {
-	platform_boundrect(x_rect, p_title, p_mode);
+	platform_boundrect(x_rect, p_title, p_mode, p_resizable);
 }
 
 //////////
 
-void MCUIDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m)
+void MCUIDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable)
 { }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/uidc.h b/engine/src/uidc.h
@@ -376,7 +376,7 @@ class MCUIDC
 	
 	const MCDisplay *getnearestdisplay(const MCRectangle& p_rectangle);
 	Boolean getwindowgeometry(Window w, MCRectangle &drect);
-	void boundrect(MCRectangle &rect, Boolean title, Window_mode m);
+	void boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable);
 	void querymouse(int2 &x, int2 &y);
 	void setmouse(int2 x, int2 y);
 
@@ -391,7 +391,7 @@ class MCUIDC
 	virtual uint16_t platform_getheight(void);
 	virtual bool platform_getdisplays(bool p_effective, MCDisplay *&r_displays, uint32_t &r_count);
 	virtual bool platform_getwindowgeometry(Window w, MCRectangle &drect);
-	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m);
+	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable);
 	virtual void platform_querymouse(int16_t &r_x, int16_t &r_y);
 	virtual void platform_setmouse(int16_t p_x, int16_t p_y);
 
diff --git a/engine/src/w32dc.h b/engine/src/w32dc.h
@@ -216,7 +216,7 @@ class MCScreenDC : public MCUIDC
 	virtual bool platform_getdisplays(bool p_effective, MCDisplay *&r_displays, uint32_t &r_count);
 	virtual bool platform_displayinfocacheable(void);
 	virtual bool platform_getwindowgeometry(Window w, MCRectangle &drect);
-	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m);
+	virtual void platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable);
 	virtual void platform_querymouse(int16_t &r_x, int16_t &r_y);
 	virtual void platform_setmouse(int16_t p_x, int16_t p_y);
 	virtual MCStack *platform_getstackatpoint(int32_t x, int32_t y);
diff --git a/engine/src/w32dce.cpp b/engine/src/w32dce.cpp
@@ -194,7 +194,7 @@ bool MCScreenDC::platform_displayinfocacheable(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m)
+void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode m, Boolean resizable)
 {
 	MCRectangle srect;
 
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
@@ -72,7 +72,8 @@ private function linkingIsValid pLinkingOutput
    repeat for each line tLine in pLinkingOutput
       // Discard Xcode 7 new warnings like:
       // ld: warning: object file (<path_to_exe) was built for newer iOS version (9.0) than being linked (7.0)
-      if not matchtext(tLine, "ld: warning: object file \(.*\) was built for newer iOS version \(.*\) than being linked \(.*\)") then
+      // On the first use of Xcode 7.0 for deployment, 'ld: warning: ' is duplicated...
+      if not matchtext(tLine, "(ld: warning: )+object file \(.*\) was built for newer iOS version \(.*\) than being linked \(.*\)") then
          return false
       end if
    end repeat

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# stack height keeps being changed between LC sessions`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Popup menu can get corrupted when click-drag out of the list`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Hiliting lines in a field are not accurate or working correctly with word selection`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# create script only stack doesn't automatically update Project Browser`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# First iOS standalone build with Xcode 7.0/7.1 causes "linking for arm" error`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ bool MCScreenDC::platform_getdisplays(bool p_effective, MCDisplay *& r_displays,`
`255`	`255`	`return true;`
`256`	`256`	`}`
`257`	`257`
`258`		`-void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode mode)`
	`258`	`+void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mode mode, Boolean resizable)`
`259`	`259`	`{`
`260`	`260`	`MCRectangle srect;`
`261`	`261`
`@@ -298,7 +298,8 @@ void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mod`
`298`	`298`	`rect.x = srect . x;`
`299`	`299`	`if (rect.x + rect.width > srect.x + srect . width - sr)`
`300`	`300`	`{`
`301`		`- if (rect.width > srect . width - sw)`
	`301`	`+ // PM-2015-10-12: [[ Bug 16177 ]] Modify stack's rect only if stack is resizable`
	`302`	`+ if (rect.width > srect . width - sw && resizable)`
`302`	`303`	`rect.width = srect . width - sw;`
`303`	`304`	`rect.x = srect . x + srect . width - rect.width - sr;`
`304`	`305`	`}`
`@@ -307,7 +308,8 @@ void MCScreenDC::platform_boundrect(MCRectangle &rect, Boolean title, Window_mod`
`307`	`308`	`rect.y = srect.y;`
`308`	`309`	`if (rect.y + rect.height > srect . y + srect . height - sb)`
`309`	`310`	`{`
`310`		`- if (rect.height > srect . height - sh)`
	`311`	`+ // PM-2015-10-12: [[ Bug 16177 ]] Modify stack's rect only if stack is resizable`
	`312`	`+ if (rect.height > srect . height - sh && resizable)`
`311`	`313`	`rect.height = srect . height - sh;`
`312`	`314`	`rect.y = srect . y + srect . height - rect.height - sb;`
`313`	`315`	`}`