livecode · peter-b · Feb 16, 2016 · Dec 7, 2015 · Dec 7, 2015 · Dec 7, 2015
diff --git a/docs/notes/bugfix-16568.md b/docs/notes/bugfix-16568.md
@@ -0,0 +1 @@
+# Browser widget visibility not updated correctly when in a group
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -1673,7 +1673,7 @@ uint2 MCButton::gettransient() const
 }
 
 
-void MCButton::setrect(const MCRectangle &nrect)
+void MCButton::applyrect(const MCRectangle &nrect)
 {	
 	rect = nrect;
 	MCRectangle trect;

diff --git a/engine/src/button.h b/engine/src/button.h
@@ -190,7 +190,7 @@ class MCButton : public MCControl
 #endif
 
 	virtual uint2 gettransient() const;
-	virtual void setrect(const MCRectangle &nrect);
+	virtual void applyrect(const MCRectangle &nrect);
 
 #ifdef LEGACY_EXEC
     virtual Exec_stat getprop_legacy(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);

diff --git a/engine/src/eps.cpp b/engine/src/eps.cpp
@@ -181,7 +181,7 @@ Boolean MCEPS::mup(uint2 which, bool p_release)
 	return True;
 }
 
-void MCEPS::setrect(const MCRectangle &nrect)
+void MCEPS::applyrect(const MCRectangle &nrect)
 {
 	if (rect.width != nrect.width || rect.height != nrect.height)
 	{

diff --git a/engine/src/eps.h b/engine/src/eps.h
@@ -50,7 +50,7 @@ class MCEPS : public MCControl
 	virtual const char *gettypestring();
 	virtual Boolean mdown(uint2 which);
 	virtual Boolean mup(uint2 which, bool p_release);
-	virtual void setrect(const MCRectangle &nrect);
+	virtual void applyrect(const MCRectangle &nrect);
 
 #ifdef LEGACY_EXEC
     virtual Exec_stat getprop_legacy(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);

diff --git a/engine/src/exec-interface-group.cpp b/engine/src/exec-interface-group.cpp
@@ -801,12 +801,21 @@ void MCGroup::GetClipsToRect(MCExecContext& ctxt, bool& r_clips_to_rect)
     r_clips_to_rect = m_clips_to_rect;
 }
 
-void MCGroup::SetVisible(MCExecContext& ctxt, uinteger_t part, bool setting)
+// PM-2015-07-02: [[ Bug 13262 ]] Make sure we attach/detach the player when
+//  showing/hiding a group that has a player
+void MCGroup::SetVisible(MCExecContext &ctxt, uinteger_t part, bool setting)
 {
-    SetVisibility(ctxt, part, setting, true);
-}
-
-void MCGroup::SetInvisible(MCExecContext& ctxt, uinteger_t part, bool setting)
-{
-    SetVisibility(ctxt, part, setting, false);
+	MCControl::SetVisible(ctxt, part, setting);
+#ifdef PLATFORM_PLAYER
+	for(MCPlayer *t_player = MCplayers; t_player != nil; t_player = t_player -> getnextplayer())
+	{
+		if (t_player -> getparent() == this)
+		{
+			if (setting)
+				t_player -> attachplayer();
+			else
+				t_player -> detachplayer();
+		}
+	}
+#endif
 }
diff --git a/engine/src/exec-interface-image.cpp b/engine/src/exec-interface-image.cpp
@@ -739,10 +739,10 @@ void MCImage::SetInk(MCExecContext& ctxt, intenum_t ink)
     notifyneeds(false);
 }
 
-void MCImage::SetVisibility(MCExecContext& ctxt, uinteger_t part, bool setting, bool visible)
+void MCImage::SetVisible(MCExecContext& ctxt, uinteger_t part, bool setting)
 {
-    Boolean wasvisible = isvisible();
-    MCObject::SetVisibility(ctxt, part, setting, visible);
+	bool wasvisible = isvisible();
+	MCObject::SetVisible(ctxt, part, setting);
     if (!(MCbufferimages || flags & F_I_ALWAYS_BUFFER)
         && !isvisible() && m_rep != nil)
         closeimage();
@@ -762,16 +762,6 @@ void MCImage::SetVisibility(MCExecContext& ctxt, uinteger_t part, bool setting,
     }
 }
 
-void MCImage::SetVisible(MCExecContext& ctxt, uinteger_t part, bool setting)
-{
-    SetVisibility(ctxt, part, setting, true);
-}
-
-void MCImage::SetInvisible(MCExecContext& ctxt, uinteger_t part, bool setting)
-{
-    SetVisibility(ctxt, part, setting, false);
-}
-
 // MERG-2015-02-11: [[ ImageMetadata ]] Refactored image metadata property
 void MCImage::GetMetadataProperty(MCExecContext& ctxt, MCNameRef p_prop, MCExecValue& r_value)
 {

diff --git a/engine/src/exec-interface-object.cpp b/engine/src/exec-interface-object.cpp
@@ -3151,17 +3151,11 @@ void MCObject::Set3D(MCExecContext& ctxt, bool setting)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void MCObject::SetVisibility(MCExecContext& ctxt, uint32_t part, bool setting, bool visible)
+void MCObject::SetVisible(MCExecContext& ctxt, uint32_t part, bool setting)
 {
 	bool dirty;
 	dirty = changeflag(setting, F_VISIBLE);
 
-	if (!visible)
-	{
-		flags ^= F_VISIBLE;
-		dirty = !dirty;
-	}
-
 	// MW-2011-10-17: [[ Bug 9813 ]] Record the current effective rect of the object.
 	MCRectangle t_old_effective_rect;
 	if (dirty && opened && gettype() >= CT_GROUP)
@@ -3188,42 +3182,27 @@ void MCObject::SetVisibility(MCExecContext& ctxt, uint32_t part, bool setting, b
 
 void MCObject::GetVisible(MCExecContext& ctxt, uint32_t part, bool& r_setting)
 {
-	r_setting = getflag(F_VISIBLE);
-}
-
-void MCObject::SetVisible(MCExecContext& ctxt, uint32_t part, bool setting)
-{
-	SetVisibility(ctxt, part, setting, true);
+	r_setting = isvisible(false);
 }
 
 void MCObject::GetEffectiveVisible(MCExecContext& ctxt, uint32_t part, bool& r_setting)
 {
-    bool t_vis;
-    t_vis = getflag(F_VISIBLE);
-
-    // if visible and effective and parent is a
-    // group then keep searching parent properties
-    if (t_vis && parent != NULL && parent->gettype() == CT_GROUP)
-        parent->GetEffectiveVisible(ctxt, part, t_vis);
-
-    r_setting = t_vis;
+	r_setting = isvisible(true);
 }
 
 void MCObject::GetInvisible(MCExecContext& ctxt, uint32_t part, bool& r_setting)
 {
-	r_setting = (flags & F_VISIBLE) == False;
+	r_setting = !isvisible(false);
 }
 
 void MCObject::SetInvisible(MCExecContext& ctxt, uint32_t part, bool setting)
 {
-	SetVisibility(ctxt, part, setting, false);
+	SetVisible(ctxt, part, !setting);
 }
 
 void MCObject::GetEffectiveInvisible(MCExecContext& ctxt, uint32_t part, bool& r_setting)
 {
-	bool t_setting;
-    GetEffectiveVisible(ctxt, part, t_setting);
-    r_setting = !t_setting;
+    r_setting = !isvisible(true);
 }
 
 void MCObject::GetEnabled(MCExecContext& ctxt, uint32_t part, bool& r_setting)

diff --git a/engine/src/exec-interface-player.cpp b/engine/src/exec-interface-player.cpp
@@ -697,10 +697,10 @@ void MCPlayer::SetBorderWidth(MCExecContext& ctxt, uinteger_t width)
     Redraw();
 }
 
-void MCPlayer::SetVisibility(MCExecContext& ctxt, uinteger_t part, bool setting, bool visible)
+void MCPlayer::SetVisible(MCExecContext& ctxt, uinteger_t part, bool setting)
 {
     uint4 oldflags = flags;
-    MCObject::SetVisibility(ctxt, part, setting, visible);
+	MCControl::SetVisible(ctxt, part, setting);
 
     // PM-2015-07-01: [[ Bug 15191 ]] Keep the LC 6.7 behaviour in non-platform player, to make the video layer to hide 
 #ifndef FEATURE_PLATFORM_PLAYER
@@ -713,16 +713,6 @@ void MCPlayer::SetVisibility(MCExecContext& ctxt, uinteger_t part, bool setting,
     updatevisibility();
 }
 
-void MCPlayer::SetVisible(MCExecContext& ctxt, uinteger_t part, bool setting)
-{
-    SetVisibility(ctxt, part, setting, true);
-}
-
-void MCPlayer::SetInvisible(MCExecContext& ctxt, uinteger_t part, bool setting)
-{
-    SetVisibility(ctxt, part, setting, false);
-}
-
 void MCPlayer::SetTraversalOn(MCExecContext& ctxt, bool setting)
 {
     MCObject::SetTraversalOn(ctxt, setting);

diff --git a/engine/src/field.cpp b/engine/src/field.cpp
@@ -1399,7 +1399,7 @@ uint2 MCField::gettransient() const
 	return 0;
 }
 
-void MCField::setrect(const MCRectangle &nrect)
+void MCField::applyrect(const MCRectangle &nrect)
 {
 	// The contents only need to be laid out if the size changes. In particular,
     // it is the width that is important; the height does not affect layout.

diff --git a/engine/src/field.h b/engine/src/field.h
@@ -282,7 +282,7 @@ class MCField : public MCControl
 	virtual void timer(MCNameRef mptr, MCParameter *params);
 	virtual void select();
 	virtual uint2 gettransient() const;
-	virtual void setrect(const MCRectangle &nrect);
+	virtual void applyrect(const MCRectangle &nrect);
 
 #ifdef LEGACY_EXEc
 	virtual Exec_stat getprop_legacy(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);

diff --git a/engine/src/graphic.cpp b/engine/src/graphic.cpp
@@ -426,7 +426,7 @@ Boolean MCGraphic::doubleup(uint2 which)
 	return MCControl::doubleup(which);
 }
 
-void MCGraphic::setrect(const MCRectangle &nrect)
+void MCGraphic::applyrect(const MCRectangle &nrect)
 {
 	if (realpoints != NULL)
 	{

diff --git a/engine/src/graphic.h b/engine/src/graphic.h
@@ -90,7 +90,7 @@ class MCGraphic : public MCControl
 	virtual Boolean mup(uint2 which, bool p_release);
 	virtual Boolean doubledown(uint2 which);
 	virtual Boolean doubleup(uint2 which);
-	virtual void setrect(const MCRectangle &nrect);
+	virtual void applyrect(const MCRectangle &nrect);
 
 	// MW-2011-11-23: [[ Array Chunk Props ]] Add 'effective' param to arrayprop access.
 #ifdef LEGACY_EXEC

diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -264,6 +264,58 @@ bool MCGroup::visit_children(MCObjectVisitorOptions p_options, uint32_t p_part,
 	return t_continue;
 }
 
+void MCGroup::toolchanged(Tool p_new_tool)
+{
+	MCControl::toolchanged(p_new_tool);
+	if (controls != nil)
+	{
+		MCControl *t_ctrl;
+		t_ctrl = controls;
+		do
+		{
+			t_ctrl->toolchanged(p_new_tool);
+			t_ctrl = t_ctrl->next();
+		}
+		while (t_ctrl != controls);
+	}
+}
+
+MCRectangle MCGroup::getviewportgeometry()
+{
+	MCRectangle t_viewport;
+	t_viewport = getrect();
+
+	MCObject *t_parent;
+	t_parent = getparent();
+	if (t_parent != nil && t_parent->gettype() == CT_GROUP)
+		t_viewport = MCU_intersect_rect(t_viewport, ((MCGroup*)t_parent)->getviewportgeometry());
+
+	return t_viewport;
+}
+
+void MCGroup::geometrychanged(const MCRectangle &p_rect)
+{
+	MCControl::geometrychanged(p_rect);
+	viewportgeometrychanged(getviewportgeometry());
+}
+
+void MCGroup::viewportgeometrychanged(const MCRectangle &p_rect)
+{
+	MCRectangle t_viewport;
+	t_viewport = MCU_intersect_rect(p_rect, getrect());
+
+	if (controls != nil)
+	{
+		MCControl *t_control = controls;
+		do
+		{
+			t_control->viewportgeometrychanged(t_viewport);
+			t_control = t_control->next();
+		}
+		while (t_control != controls);
+	}
+}
+
 void MCGroup::open()
 {
 	MCControl::open();
@@ -796,7 +848,7 @@ Boolean MCGroup::doubleup(uint2 which)
 	return False;
 }
 
-void MCGroup::setrect(const MCRectangle &nrect)
+void MCGroup::applyrect(const MCRectangle &nrect)
 {
 	bool t_size_changed;
 	t_size_changed = nrect . width != rect . width || nrect . height != rect . height;
@@ -2747,6 +2799,10 @@ bool MCGroup::computeminrect(Boolean scrolling)
 		else
 			t_all = true;
 		state = oldstate;
+
+		// IM-2015-12-16: [[ NativeLayer ]] The group rect has changed, so send geometry change notification.
+		geometrychanged(getrect());
+
 		return t_all;
 	}
 	else if ((flags & F_HSCROLLBAR || flags & F_VSCROLLBAR)
@@ -3695,6 +3751,25 @@ void MCGroup::relayercontrol_insert(MCControl *p_control, MCControl *p_target)
 		p_control -> layer_redrawall();
 }
 
+bool MCGroup::getNativeContainerLayer(MCNativeLayer *&r_layer)
+{
+	if (getNativeLayer() == nil)
+	{
+		void *t_view;
+		if (!MCNativeLayer::CreateNativeContainer(t_view))
+			return false;
+		if (!SetNativeView(t_view))
+		{
+			MCNativeLayer::ReleaseNativeView(t_view);
+			return false;
+		}
+	}
+
+	r_layer = getNativeLayer();
+
+	return true;
+}
+
 void MCGroup::scheduledelete(bool p_is_child)
 {
     MCControl::scheduledelete(p_is_child);
@@ -3710,22 +3785,3 @@ void MCGroup::scheduledelete(bool p_is_child)
 		while(t_control != controls);
 	}
 }
-
-// PM-2015-07-02: [[ Bug 13262 ]] Make sure we attach/detach the player when
-//  showing/hiding a group that has a player
-void MCGroup::SetVisibility(MCExecContext &ctxt, uinteger_t part, bool flag, bool visible)
-{
-    MCControl::SetVisibility(ctxt, part, flag, visible);
-#ifdef PLATFORM_PLAYER
-    for(MCPlayer *t_player = MCplayers; t_player != nil; t_player = t_player -> getnextplayer())
-    {
-        if (t_player -> getparent() == this)
-        {
-            if (flag && visible || !flag && !visible)
-                t_player -> attachplayer();
-            else
-                t_player -> detachplayer();
-        }
-    }
-#endif
-}
diff --git a/engine/src/group.h b/engine/src/group.h
@@ -81,7 +81,7 @@ class MCGroup : public MCControl
 	virtual Boolean mup(uint2 which, bool p_release);
 	virtual Boolean doubledown(uint2 which);
 	virtual Boolean doubleup(uint2 which);
-	virtual void setrect(const MCRectangle &nrect);
+	virtual void applyrect(const MCRectangle &nrect);
 
 #ifdef LEGACY_EXEC
 	virtual Exec_stat getprop_legacy(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
@@ -129,6 +129,16 @@ class MCGroup : public MCControl
 	virtual void relayercontrol_remove(MCControl *control);
 	virtual void relayercontrol_insert(MCControl *control, MCControl *target);
 
+	virtual void toolchanged(Tool p_new_tool);
+
+	virtual void geometrychanged(const MCRectangle &p_rect);
+
+	virtual void viewportgeometrychanged(const MCRectangle &p_rect);
+
+	virtual MCRectangle getviewportgeometry();
+
+	bool getNativeContainerLayer(MCNativeLayer *&r_layer);
+
     virtual void scheduledelete(bool p_is_child);
 
 	MCControl *findchildwithid(Chunk_term type, uint4 p_id);
@@ -302,9 +312,7 @@ class MCGroup : public MCControl
     void SetClipsToRect(MCExecContext& ctxt, bool p_clips_to_rect);
     void GetClipsToRect(MCExecContext& ctxt, bool &r_clips_to_rect);
 
-    void SetInvisible(MCExecContext& ctxt, uinteger_t part, bool setting);
     void SetVisible(MCExecContext& ctxt, uinteger_t part, bool setting);
-    void SetVisibility(MCExecContext& ctxt, uinteger_t part, bool flag, bool visible);
 
 	virtual void SetEnabled(MCExecContext& ctxt, uint32_t part, bool setting);
 	virtual void SetDisabled(MCExecContext& ctxt, uint32_t part, bool setting);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Browser widget visibility not updated correctly when in a group