- To listen for pointer events, NonDrawingGraphic is now used instead of an Image (results in slightly improved graphics performance)

yasirkula · yasirkula · commit 0f9252e1114c · 2019-11-02T16:28:29.000+03:00
- Fixed #3
diff --git a/DynamicPanels.unitypackage b/DynamicPanels.unitypackage
diff --git a/Plugins/DynamicPanels/Scripts/Anchoring/AnchorZoneBase.cs b/Plugins/DynamicPanels/Scripts/Anchoring/AnchorZoneBase.cs
@@ -12,7 +12,7 @@ public abstract class AnchorZoneBase : MonoBehaviour, IPointerEnterHandler, IPoi
 
 		public RectTransform RectTransform { get; private set; }
 
-		private Image raycastZone;
+		private Graphic raycastZone;
 
 		private int hoveredPointerId = PanelManager.NON_EXISTING_TOUCH;
 
@@ -21,9 +21,7 @@ public abstract class AnchorZoneBase : MonoBehaviour, IPointerEnterHandler, IPoi
 		protected void Awake()
 		{
 			RectTransform = (RectTransform) transform;
-
-			raycastZone = gameObject.AddComponent<Image>();
-			raycastZone.color = Color.clear;
+			raycastZone = gameObject.AddComponent<NonDrawingGraphic>();
 		}
 
 		protected void OnEnable()
@@ -37,7 +35,6 @@ protected void OnEnable()
 		public void Initialize( Panel panel )
 		{
 			m_panel = panel;
-			raycastZone.sprite = panel.Internal.BackgroundSprite;
 		}
 
 		public void SetActive( bool value )
diff --git a/Plugins/DynamicPanels/Scripts/DynamicPanelsCanvas.cs b/Plugins/DynamicPanels/Scripts/DynamicPanelsCanvas.cs
@@ -18,15 +18,15 @@ public InternalSettings( DynamicPanelsCanvas canvas )
 				this.canvas = canvas;
 
 #if UNITY_EDITOR
-				if( canvas.UnityCanvas == null ) // is null while inspecting this component in edit mode
+				if( !canvas.UnityCanvas ) // is null while inspecting this component in edit mode
 					return;
 #endif
 
 				if( canvas.UnityCanvas.renderMode == RenderMode.ScreenSpaceOverlay ||
-					( canvas.UnityCanvas.renderMode == RenderMode.ScreenSpaceCamera && canvas.UnityCanvas.worldCamera == null ) )
+					( canvas.UnityCanvas.renderMode == RenderMode.ScreenSpaceCamera && !canvas.UnityCanvas.worldCamera ) )
 					worldCamera = null;
 				else
-					worldCamera = canvas.UnityCanvas.worldCamera ?? Camera.main;
+					worldCamera = canvas.UnityCanvas.worldCamera ? canvas.UnityCanvas.worldCamera : Camera.main;
 			}
 
 			public Panel DummyPanel { get { return canvas.dummyPanel; } }
@@ -140,7 +140,7 @@ public string ID
 		public Vector2 Size { get; private set; }
 
 		private Panel dummyPanel;
-		private Image background;
+		private Graphic background;
 
 		private RectTransform anchorZonesParent;
 		private readonly CanvasAnchorZone[] anchorZones = new CanvasAnchorZone[4]; // one for each side
@@ -208,22 +208,20 @@ private void Awake()
 #endif
 
 			UnanchoredPanelGroup = new UnanchoredPanelGroup( this );
-			RectTransform.pivot = new Vector2( 0.5f, 0.5f );
+			RectTransform.ChangePivotWithoutAffectingPosition( new Vector2( 0.5f, 0.5f ) );
 
-			if( GetComponent<RectMask2D>() == null )
+			if( !GetComponent<RectMask2D>() )
 				gameObject.AddComponent<RectMask2D>();
 
 			Size = RectTransform.rect.size;
 
 			InitializeRootGroup();
 			InitializeAnchorZones();
 
-			background = GetComponent<Image>();
-			if( background == null )
+			background = GetComponent<Graphic>();
+			if( !background )
 			{
-				background = gameObject.AddComponent<Image>();
-				background.sprite = dummyPanel.Internal.BackgroundSprite;
-				background.color = Color.clear;
+				background = gameObject.AddComponent<NonDrawingGraphic>();
 				background.raycastTarget = false;
 			}
 
@@ -236,7 +234,7 @@ private void Start()
 
 			HashSet<Transform> createdTabs = new HashSet<Transform>(); // A set to prevent duplicate tabs or to prevent making canvas itself a panel
 			Transform tr = transform;
-			while( tr != null )
+			while( tr )
 			{
 				createdTabs.Add( tr );
 				tr = tr.parent;
@@ -384,7 +382,7 @@ private Panel CreateInitialPanel( PanelProperties properties, Panel anchor, Dire
 			for( int i = 0; i < properties.tabs.Count; i++ )
 			{
 				PanelTabProperties panelProps = properties.tabs[i];
-				if( panelProps.content != null && !panelProps.content.Equals( null ) )
+				if( panelProps.content )
 				{
 					if( createdTabs.Contains( panelProps.content ) )
 						continue;
diff --git a/Plugins/DynamicPanels/Scripts/Grouping/UnanchoredPanelGroup.cs b/Plugins/DynamicPanels/Scripts/Grouping/UnanchoredPanelGroup.cs
@@ -45,7 +45,7 @@ protected override void UpdateLayout()
 		protected override void EnsureMinimumSizeOf( IPanelGroupElement element )
 		{
 			Panel panel = element as Panel;
-			if( panel == null || panel.Equals( null ) )
+			if( !panel )
 				return;
 
 			Vector2 position = panel.Position;
diff --git a/Plugins/DynamicPanels/Scripts/Helpers/NonDrawingGraphic.cs b/Plugins/DynamicPanels/Scripts/Helpers/NonDrawingGraphic.cs
@@ -0,0 +1,17 @@
+﻿using UnityEngine.UI;
+
+namespace DynamicPanels
+{
+	// Credit: http://answers.unity.com/answers/1157876/view.html
+	public class NonDrawingGraphic : Graphic
+	{
+		public override void SetMaterialDirty() { return; }
+		public override void SetVerticesDirty() { return; }
+
+		protected override void OnPopulateMesh( VertexHelper vh )
+		{
+			vh.Clear();
+			return;
+		}
+	}
+}
diff --git a/Plugins/DynamicPanels/Scripts/Helpers/NonDrawingGraphic.cs.meta b/Plugins/DynamicPanels/Scripts/Helpers/NonDrawingGraphic.cs.meta
diff --git a/Plugins/DynamicPanels/Scripts/Helpers/PanelTab.cs b/Plugins/DynamicPanels/Scripts/Helpers/PanelTab.cs
@@ -151,7 +151,7 @@ public Panel Detach()
 
 		private void SetActive( bool activeState )
 		{
-			if( Content == null || Content.Equals( null ) )
+			if( !Content )
 				m_panel.Internal.RemoveTab( m_panel.GetTabIndex( this ), true );
 			else
 			{
@@ -166,7 +166,7 @@ private void SetActive( bool activeState )
 
 		void IPointerClickHandler.OnPointerClick( PointerEventData eventData )
 		{
-			if( Content == null || Content.Equals( null ) )
+			if( !Content )
 				m_panel.Internal.RemoveTab( m_panel.GetTabIndex( this ), true );
 			else
 				m_panel.ActiveTab = m_panel.GetTabIndex( this );
diff --git a/Plugins/DynamicPanels/Scripts/Helpers/PanelUtils.cs b/Plugins/DynamicPanels/Scripts/Helpers/PanelUtils.cs
@@ -17,7 +17,7 @@ public static Panel CreatePanel( RectTransform content, DynamicPanelsCanvas canv
 					if( canvas == null )
 					{
 						canvas = Object.FindObjectOfType<DynamicPanelsCanvas>();
-						if( canvas == null || canvas.Equals( null ) )
+						if( !canvas )
 						{
 							Debug.LogError( "Panels require a DynamicPanelsCanvas!" );
 							return null;
@@ -59,7 +59,7 @@ public static Panel CreatePanel( RectTransform content, DynamicPanelsCanvas canv
 
 		public static Panel CreatePanelFor( RectTransform content, DynamicPanelsCanvas canvas )
 		{
-			if( content == null || content.Equals( null ) )
+			if( !content )
 			{
 				Debug.LogError( "Content is null!" );
 				return null;
@@ -70,7 +70,7 @@ public static Panel CreatePanelFor( RectTransform content, DynamicPanelsCanvas c
 
 		public static PanelTab GetAssociatedTab( RectTransform content )
 		{
-			if( content == null || content.Equals( null ) )
+			if( !content )
 			{
 				Debug.LogError( "Content is null!" );
 				return null;
@@ -95,5 +95,36 @@ public static bool IsNull( this IPanelGroupElement element )
 		{
 			return element == null || element.Equals( null );
 		}
+
+		// Credit: https://github.com/Unity-Technologies/UnityCsReference/blob/4fc5eb0fb2c7f5fb09f990fc99f162c8d06d9570/Editor/Mono/Inspector/RectTransformEditor.cs#L1259
+		public static void ChangePivotWithoutAffectingPosition( this RectTransform rectTransform, Vector2 pivot )
+		{
+			if( rectTransform.pivot == pivot )
+				return;
+
+			Vector3 cornerBefore;
+			Vector3[] s_Corners = new Vector3[4];
+			rectTransform.GetWorldCorners( s_Corners );
+			if( rectTransform.parent )
+				cornerBefore = rectTransform.parent.InverseTransformPoint( s_Corners[0] );
+			else
+				cornerBefore = s_Corners[0];
+
+			rectTransform.pivot = pivot;
+
+			Vector3 cornerAfter;
+			rectTransform.GetWorldCorners( s_Corners );
+			if( rectTransform.parent )
+				cornerAfter = rectTransform.parent.InverseTransformPoint( s_Corners[0] );
+			else
+				cornerAfter = s_Corners[0];
+
+			Vector3 cornerOffset = cornerAfter - cornerBefore;
+			rectTransform.anchoredPosition -= (Vector2) cornerOffset;
+
+			Vector3 pos = rectTransform.transform.position;
+			pos.z -= cornerOffset.z;
+			rectTransform.transform.position = pos;
+		}
 	}
 }
diff --git a/Plugins/DynamicPanels/Scripts/Panel.cs b/Plugins/DynamicPanels/Scripts/Panel.cs
@@ -76,7 +76,7 @@ public void ValidateTabs()
 				{
 					for( int i = panel.tabs.Count - 1; i >= 0; i-- )
 					{
-						if( panel.tabs[i].Content == null || panel.tabs[i].Content.Equals( null ) || panel.tabs[i].Content.parent != panel.contentParent )
+						if( !panel.tabs[i].Content || panel.tabs[i].Content.parent != panel.contentParent )
 							RemoveTab( i, true );
 					}
 				}
@@ -289,7 +289,7 @@ public PanelTab this[int tabIndex]
 			}
 			set
 			{
-				if( value != null && !value.Equals( null ) )
+				if( value )
 					AddTab( value.Content, tabIndex );
 			}
 		}
@@ -382,7 +382,7 @@ private void OnApplicationQuit()
 
 		public PanelTab AddTab( RectTransform tabContent, int tabIndex = -1 )
 		{
-			if( tabContent == null || tabContent.Equals( null ) )
+			if( !tabContent )
 				return null;
 
 			// Reset active tab because otherwise, it acts buggy in rare cases
@@ -398,7 +398,7 @@ public PanelTab AddTab( RectTransform tabContent, int tabIndex = -1 )
 			if( thisTabIndex == -1 )
 			{
 				PanelTab tab = PanelUtils.GetAssociatedTab( tabContent );
-				if( tab == null )
+				if( !tab )
 				{
 					tab = (PanelTab) Instantiate( Resources.Load<PanelTab>( "DynamicPanelTab" ), tabsParent, false );
 					tabs.Insert( tabIndex, tab );
@@ -445,7 +445,7 @@ public PanelTab AddTab( RectTransform tabContent, int tabIndex = -1 )
 
 		public PanelTab AddTab( PanelTab tab, int tabIndex = -1 )
 		{
-			if( tab == null || tab.Equals( null ) )
+			if( !tab )
 				return null;
 
 			return AddTab( tab.Content, tabIndex );
@@ -686,10 +686,7 @@ private PanelResizeHelper GetResizeZone( Direction direction )
 
 			resizeZone = new GameObject( "ResizeZone" + direction, typeof( RectTransform ) ).AddComponent<PanelResizeHelper>();
 			resizeZone.RectTransform.SetParent( resizeZonesParent, false );
-
-			Image background = resizeZone.gameObject.AddComponent<Image>();
-			background.color = Color.clear;
-			background.sprite = Internal.BackgroundSprite;
+			resizeZone.gameObject.AddComponent<NonDrawingGraphic>();
 
 			resizeZones[(int) direction] = resizeZone;
 
diff --git a/Plugins/DynamicPanels/Scripts/PanelManager.cs b/Plugins/DynamicPanels/Scripts/PanelManager.cs
@@ -354,7 +354,7 @@ public void OnPointerEnteredCanvas( DynamicPanelsCanvas canvas, PointerEventData
 						{
 							previewPanelCanvas = canvas;
 
-							if( hoveredAnchorZone != null && !hoveredAnchorZone.Equals( null ) && hoveredAnchorZone.Panel.Canvas != canvas )
+							if( hoveredAnchorZone && hoveredAnchorZone.Panel.Canvas != canvas )
 								hoveredAnchorZone.OnPointerExit( pointer );
 
 							previewPanel.SetParent( canvas.RectTransform, false );
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This asset helps you create dynamic panels using Unity's UI system. These panels
 
 ## HOW TO
 
-First, import **DynamicPanels.unitypackage** to your project. Afterwards, add **Dynamic Panels Canvas** component to the *RectTransform* that you want to move your panels inside. This RectTransform doesn't have to be the Canvas object. It can be any child of it and can be of any custom size.
+First, import [DynamicPanels.unitypackage](https://github.com/yasirkula/UnityDynamicPanels/releases) to your project. Afterwards, add **Dynamic Panels Canvas** component to the *RectTransform* that you want to move your panels inside. This RectTransform doesn't have to be the Canvas object. It can be any child of it and can be of any custom size.
 
 There are two ways to create panels: by using the GUI of Dynamic Panels Canvas or via Scripting API. There are also two types of panels: *free panels* that can be moved around and resized freely and *docked panels* that are moved by the layout system, depending on where it is docked to. A panel can have multiple tabs.
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public abstract class AnchorZoneBase : MonoBehaviour, IPointerEnterHandler, IPoi`
`12`	`12`
`13`	`13`	`public RectTransform RectTransform { get; private set; }`
`14`	`14`
`15`		`- private Image raycastZone;`
	`15`	`+ private Graphic raycastZone;`
`16`	`16`
`17`	`17`	`private int hoveredPointerId = PanelManager.NON_EXISTING_TOUCH;`
`18`	`18`
`@@ -21,9 +21,7 @@ public abstract class AnchorZoneBase : MonoBehaviour, IPointerEnterHandler, IPoi`
`21`	`21`	`protected void Awake()`
`22`	`22`	`{`
`23`	`23`	`RectTransform = (RectTransform) transform;`
`24`		`-`
`25`		`- raycastZone = gameObject.AddComponent<Image>();`
`26`		`- raycastZone.color = Color.clear;`
	`24`	`+ raycastZone = gameObject.AddComponent<NonDrawingGraphic>();`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`protected void OnEnable()`
`@@ -37,7 +35,6 @@ protected void OnEnable()`
`37`	`35`	`public void Initialize( Panel panel )`
`38`	`36`	`{`
`39`	`37`	`m_panel = panel;`
`40`		`- raycastZone.sprite = panel.Internal.BackgroundSprite;`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`public void SetActive( bool value )`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected override void UpdateLayout()`
`45`	`45`	`protected override void EnsureMinimumSizeOf( IPanelGroupElement element )`
`46`	`46`	`{`
`47`	`47`	`Panel panel = element as Panel;`
`48`		`- if( panel == null \|\| panel.Equals( null ) )`
	`48`	`+ if( !panel )`
`49`	`49`	`return;`
`50`	`50`
`51`	`51`	`Vector2 position = panel.Position;`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public Panel Detach()`
`151`	`151`
`152`	`152`	`private void SetActive( bool activeState )`
`153`	`153`	`{`
`154`		`- if( Content == null \|\| Content.Equals( null ) )`
	`154`	`+ if( !Content )`
`155`	`155`	`m_panel.Internal.RemoveTab( m_panel.GetTabIndex( this ), true );`
`156`	`156`	`else`
`157`	`157`	`{`
`@@ -166,7 +166,7 @@ private void SetActive( bool activeState )`
`166`	`166`
`167`	`167`	`void IPointerClickHandler.OnPointerClick( PointerEventData eventData )`
`168`	`168`	`{`
`169`		`- if( Content == null \|\| Content.Equals( null ) )`
	`169`	`+ if( !Content )`
`170`	`170`	`m_panel.Internal.RemoveTab( m_panel.GetTabIndex( this ), true );`
`171`	`171`	`else`
`172`	`172`	`m_panel.ActiveTab = m_panel.GetTabIndex( this );`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void ValidateTabs()`
`76`	`76`	`{`
`77`	`77`	`for( int i = panel.tabs.Count - 1; i >= 0; i-- )`
`78`	`78`	`{`
`79`		`- if( panel.tabs[i].Content == null \|\| panel.tabs[i].Content.Equals( null ) \|\| panel.tabs[i].Content.parent != panel.contentParent )`
	`79`	`+ if( !panel.tabs[i].Content \|\| panel.tabs[i].Content.parent != panel.contentParent )`
`80`	`80`	`RemoveTab( i, true );`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -289,7 +289,7 @@ public PanelTab this[int tabIndex]`
`289`	`289`	`}`
`290`	`290`	`set`
`291`	`291`	`{`
`292`		`- if( value != null && !value.Equals( null ) )`
	`292`	`+ if( value )`
`293`	`293`	`AddTab( value.Content, tabIndex );`
`294`	`294`	`}`
`295`	`295`	`}`
`@@ -382,7 +382,7 @@ private void OnApplicationQuit()`
`382`	`382`
`383`	`383`	`public PanelTab AddTab( RectTransform tabContent, int tabIndex = -1 )`
`384`	`384`	`{`
`385`		`- if( tabContent == null \|\| tabContent.Equals( null ) )`
	`385`	`+ if( !tabContent )`
`386`	`386`	`return null;`
`387`	`387`
`388`	`388`	`// Reset active tab because otherwise, it acts buggy in rare cases`
`@@ -398,7 +398,7 @@ public PanelTab AddTab( RectTransform tabContent, int tabIndex = -1 )`
`398`	`398`	`if( thisTabIndex == -1 )`
`399`	`399`	`{`
`400`	`400`	`PanelTab tab = PanelUtils.GetAssociatedTab( tabContent );`
`401`		`- if( tab == null )`
	`401`	`+ if( !tab )`
`402`	`402`	`{`
`403`	`403`	`tab = (PanelTab) Instantiate( Resources.Load<PanelTab>( "DynamicPanelTab" ), tabsParent, false );`
`404`	`404`	`tabs.Insert( tabIndex, tab );`
`@@ -445,7 +445,7 @@ public PanelTab AddTab( RectTransform tabContent, int tabIndex = -1 )`
`445`	`445`
`446`	`446`	`public PanelTab AddTab( PanelTab tab, int tabIndex = -1 )`
`447`	`447`	`{`
`448`		`- if( tab == null \|\| tab.Equals( null ) )`
	`448`	`+ if( !tab )`
`449`	`449`	`return null;`
`450`	`450`
`451`	`451`	`return AddTab( tab.Content, tabIndex );`
`@@ -686,10 +686,7 @@ private PanelResizeHelper GetResizeZone( Direction direction )`
`686`	`686`
`687`	`687`	`resizeZone = new GameObject( "ResizeZone" + direction, typeof( RectTransform ) ).AddComponent<PanelResizeHelper>();`
`688`	`688`	`resizeZone.RectTransform.SetParent( resizeZonesParent, false );`
`689`		`-`
`690`		`- Image background = resizeZone.gameObject.AddComponent<Image>();`
`691`		`- background.color = Color.clear;`
`692`		`- background.sprite = Internal.BackgroundSprite;`
	`689`	`+ resizeZone.gameObject.AddComponent<NonDrawingGraphic>();`
`693`	`690`
`694`	`691`	`resizeZones[(int) direction] = resizeZone;`
`695`	`692`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public void OnPointerEnteredCanvas( DynamicPanelsCanvas canvas, PointerEventData`
`354`	`354`	`{`
`355`	`355`	`previewPanelCanvas = canvas;`
`356`	`356`
`357`		`- if( hoveredAnchorZone != null && !hoveredAnchorZone.Equals( null ) && hoveredAnchorZone.Panel.Canvas != canvas )`
	`357`	`+ if( hoveredAnchorZone && hoveredAnchorZone.Panel.Canvas != canvas )`
`358`	`358`	`hoveredAnchorZone.OnPointerExit( pointer );`
`359`	`359`
`360`	`360`	`previewPanel.SetParent( canvas.RectTransform, false );`