pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added tooltips to new properties on V & H ScrollSnaps 

Moved new ScrollConflictManager script to correct place

--HG--
branch : develop_5.3
pull/413/head
Simon (darkside) Jackson 2016-05-17 22:46:37 +01:00
parent 3d39d1da47
commit ca29aabed3
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Scripts/Layout/HorizontalScrollSnap.cs
View File

@ -26,8 +26,6 @@ namespace UnityEngine.UI.Extensions
private Vector3 _lerp_target; private Vector3 _lerp_target;
private bool _lerp; private bool _lerp;
private int _containerSize;
[Tooltip("The gameobject that contains toggles which suggest pagination. (optional)")] [Tooltip("The gameobject that contains toggles which suggest pagination. (optional)")]
public GameObject Pagination; public GameObject Pagination;
@ -45,7 +43,9 @@ namespace UnityEngine.UI.Extensions
private Vector3 _startPosition = new Vector3(); private Vector3 _startPosition = new Vector3();
private int _currentScreen; private int _currentScreen;
[Tooltip("The screen / page to start the control on")]
public int StartingScreen = 1; public int StartingScreen = 1;
[Tooltip("The distance between two pages, by default 3 times the height of the control")]
public int PageStep = 0; public int PageStep = 0;
@ -78,8 +78,6 @@ namespace UnityEngine.UI.Extensions
_scroll_rect.horizontalNormalizedPosition = (float)(StartingScreen - 1) / (_screens - 1); _scroll_rect.horizontalNormalizedPosition = (float)(StartingScreen - 1) / (_screens - 1);
_containerSize = (int)_screensContainer.gameObject.GetComponent<RectTransform>().offsetMax.x;
ChangeBulletsInfo(_currentScreen); ChangeBulletsInfo(_currentScreen);
if (NextButton) if (NextButton)

6
Scripts/Layout/VerticalScrollSnap.cs
View File

@ -25,8 +25,6 @@ namespace UnityEngine.UI.Extensions
private Vector3 _lerp_target; private Vector3 _lerp_target;
private bool _lerp; private bool _lerp;
private int _containerSize;
[Tooltip("The gameobject that contains toggles which suggest pagination. (optional)")] [Tooltip("The gameobject that contains toggles which suggest pagination. (optional)")]
public GameObject Pagination; public GameObject Pagination;
@ -44,7 +42,9 @@ namespace UnityEngine.UI.Extensions
private Vector3 _startPosition = new Vector3(); private Vector3 _startPosition = new Vector3();
private int _currentScreen; private int _currentScreen;
[Tooltip("The screen / page to start the control on")]
public int StartingScreen = 1; public int StartingScreen = 1;
[Tooltip("The distance between two pages, by default 3 times the width of the control")]
public int PageStep = 0; public int PageStep = 0;
// Use this for initialization // Use this for initialization
@ -75,8 +75,6 @@ namespace UnityEngine.UI.Extensions
_scroll_rect.verticalNormalizedPosition = (float)(StartingScreen - 1) / (float)(_screens - 1); _scroll_rect.verticalNormalizedPosition = (float)(StartingScreen - 1) / (float)(_screens - 1);
_containerSize = (int)_screensContainer.gameObject.GetComponent<RectTransform>().offsetMax.y;
ChangeBulletsInfo(_currentScreen); ChangeBulletsInfo(_currentScreen);
if (NextButton) if (NextButton)

8
Scripts/ReorderableList/ScrollConflictManager.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4a1735d6bfaf3e5479675d80bf6619a9
timeCreated: 1463330124
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

0
Scripts/ReorderableList/ScrollConflictManager → Scripts/Utilities/ScrollConflictManager.cs
View File

12
Scripts/Utilities/ScrollConflictManager.cs.meta Normal file
View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: cee880d45d4659540ada44c73f95a947
timeCreated: 1463521238
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: