diff --git a/Scripts/Layout/HorizontalScrollSnap.cs b/Scripts/Layout/HorizontalScrollSnap.cs index e94150a..3ddb137 100644 --- a/Scripts/Layout/HorizontalScrollSnap.cs +++ b/Scripts/Layout/HorizontalScrollSnap.cs @@ -26,8 +26,6 @@ namespace UnityEngine.UI.Extensions private Vector3 _lerp_target; private bool _lerp; - private int _containerSize; - [Tooltip("The gameobject that contains toggles which suggest pagination. (optional)")] public GameObject Pagination; @@ -45,7 +43,9 @@ namespace UnityEngine.UI.Extensions private Vector3 _startPosition = new Vector3(); private int _currentScreen; + [Tooltip("The screen / page to start the control on")] public int StartingScreen = 1; + [Tooltip("The distance between two pages, by default 3 times the height of the control")] public int PageStep = 0; @@ -78,8 +78,6 @@ namespace UnityEngine.UI.Extensions _scroll_rect.horizontalNormalizedPosition = (float)(StartingScreen - 1) / (_screens - 1); - _containerSize = (int)_screensContainer.gameObject.GetComponent().offsetMax.x; - ChangeBulletsInfo(_currentScreen); if (NextButton) diff --git a/Scripts/Layout/VerticalScrollSnap.cs b/Scripts/Layout/VerticalScrollSnap.cs index 016aee0..13e9161 100644 --- a/Scripts/Layout/VerticalScrollSnap.cs +++ b/Scripts/Layout/VerticalScrollSnap.cs @@ -25,8 +25,6 @@ namespace UnityEngine.UI.Extensions private Vector3 _lerp_target; private bool _lerp; - private int _containerSize; - [Tooltip("The gameobject that contains toggles which suggest pagination. (optional)")] public GameObject Pagination; @@ -44,7 +42,9 @@ namespace UnityEngine.UI.Extensions private Vector3 _startPosition = new Vector3(); private int _currentScreen; + [Tooltip("The screen / page to start the control on")] public int StartingScreen = 1; + [Tooltip("The distance between two pages, by default 3 times the width of the control")] public int PageStep = 0; // Use this for initialization @@ -75,8 +75,6 @@ namespace UnityEngine.UI.Extensions _scroll_rect.verticalNormalizedPosition = (float)(StartingScreen - 1) / (float)(_screens - 1); - _containerSize = (int)_screensContainer.gameObject.GetComponent().offsetMax.y; - ChangeBulletsInfo(_currentScreen); if (NextButton) diff --git a/Scripts/ReorderableList/ScrollConflictManager.meta b/Scripts/ReorderableList/ScrollConflictManager.meta deleted file mode 100644 index 5ea26f3..0000000 --- a/Scripts/ReorderableList/ScrollConflictManager.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4a1735d6bfaf3e5479675d80bf6619a9 -timeCreated: 1463330124 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Scripts/ReorderableList/ScrollConflictManager b/Scripts/Utilities/ScrollConflictManager.cs similarity index 100% rename from Scripts/ReorderableList/ScrollConflictManager rename to Scripts/Utilities/ScrollConflictManager.cs diff --git a/Scripts/Utilities/ScrollConflictManager.cs.meta b/Scripts/Utilities/ScrollConflictManager.cs.meta new file mode 100644 index 0000000..fa839e2 --- /dev/null +++ b/Scripts/Utilities/ScrollConflictManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: cee880d45d4659540ada44c73f95a947 +timeCreated: 1463521238 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: