From ee300b4079f2330925e3a22144c053e45f61176b Mon Sep 17 00:00:00 2001 From: Simon Jackson Date: Mon, 18 Jul 2016 21:36:36 +0100 Subject: [PATCH] Some more restructuring whilst documentation updates continue. Hopefully last breaking changes. --HG-- branch : develop_5.3 --- {Scripts => Examples}/HSVPicker/Picker.prefab | 0 {Scripts => Examples}/HSVPicker/Picker.prefab.meta | 0 {Scripts => Examples}/HSVPicker/PickerTest.unity | 0 .../HSVPicker/PickerTest.unity.meta | 0 README.md | 6 +++--- .../{ => Controls}/HSVPicker/ColorPickerTester.cs | 0 .../HSVPicker/ColorPickerTester.cs.meta | 0 Scripts/{ => Controls}/HSVPicker/HSVPicker.cs | 0 Scripts/{ => Controls}/HSVPicker/HSVPicker.cs.meta | 0 Scripts/{ => Controls}/HSVPicker/HSVSliderEvent.cs | 0 .../HSVPicker/HSVSliderEvent.cs.meta | 0 Scripts/{ => Controls}/HSVPicker/HSVUtil.cs | 0 Scripts/{ => Controls}/HSVPicker/HSVUtil.cs.meta | 0 Scripts/{ => Controls}/HSVPicker/HexRGB.cs | 0 Scripts/{ => Controls}/HSVPicker/HexRGB.cs.meta | 0 Scripts/{ => Controls}/HSVPicker/HsvBoxSelector.cs | 0 .../HSVPicker/HsvBoxSelector.cs.meta | 0 .../{ => Controls}/HSVPicker/HsvSliderPicker.cs | 0 .../HSVPicker/HsvSliderPicker.cs.meta | 0 Scripts/{Effects => Controls}/ImageExtended.cs | 0 .../{Effects => Controls}/ImageExtended.cs.meta | 0 Scripts/{Utilities => Controls}/InputFocus.cs | 0 Scripts/{Utilities => Controls}/InputFocus.cs.meta | 0 Scripts/Layout/ScrollSnap.cs | 14 +++++++------- Scripts/ToolTips/HoverTooltip.cs | 1 + 25 files changed, 11 insertions(+), 10 deletions(-) rename {Scripts => Examples}/HSVPicker/Picker.prefab (100%) rename {Scripts => Examples}/HSVPicker/Picker.prefab.meta (100%) rename {Scripts => Examples}/HSVPicker/PickerTest.unity (100%) rename {Scripts => Examples}/HSVPicker/PickerTest.unity.meta (100%) rename Scripts/{ => Controls}/HSVPicker/ColorPickerTester.cs (100%) rename Scripts/{ => Controls}/HSVPicker/ColorPickerTester.cs.meta (100%) rename Scripts/{ => Controls}/HSVPicker/HSVPicker.cs (100%) rename Scripts/{ => Controls}/HSVPicker/HSVPicker.cs.meta (100%) rename Scripts/{ => Controls}/HSVPicker/HSVSliderEvent.cs (100%) rename Scripts/{ => Controls}/HSVPicker/HSVSliderEvent.cs.meta (100%) rename Scripts/{ => Controls}/HSVPicker/HSVUtil.cs (100%) rename Scripts/{ => Controls}/HSVPicker/HSVUtil.cs.meta (100%) rename Scripts/{ => Controls}/HSVPicker/HexRGB.cs (100%) rename Scripts/{ => Controls}/HSVPicker/HexRGB.cs.meta (100%) rename Scripts/{ => Controls}/HSVPicker/HsvBoxSelector.cs (100%) rename Scripts/{ => Controls}/HSVPicker/HsvBoxSelector.cs.meta (100%) rename Scripts/{ => Controls}/HSVPicker/HsvSliderPicker.cs (100%) rename Scripts/{ => Controls}/HSVPicker/HsvSliderPicker.cs.meta (100%) rename Scripts/{Effects => Controls}/ImageExtended.cs (100%) rename Scripts/{Effects => Controls}/ImageExtended.cs.meta (100%) rename Scripts/{Utilities => Controls}/InputFocus.cs (100%) rename Scripts/{Utilities => Controls}/InputFocus.cs.meta (100%) diff --git a/Scripts/HSVPicker/Picker.prefab b/Examples/HSVPicker/Picker.prefab similarity index 100% rename from Scripts/HSVPicker/Picker.prefab rename to Examples/HSVPicker/Picker.prefab diff --git a/Scripts/HSVPicker/Picker.prefab.meta b/Examples/HSVPicker/Picker.prefab.meta similarity index 100% rename from Scripts/HSVPicker/Picker.prefab.meta rename to Examples/HSVPicker/Picker.prefab.meta diff --git a/Scripts/HSVPicker/PickerTest.unity b/Examples/HSVPicker/PickerTest.unity similarity index 100% rename from Scripts/HSVPicker/PickerTest.unity rename to Examples/HSVPicker/PickerTest.unity diff --git a/Scripts/HSVPicker/PickerTest.unity.meta b/Examples/HSVPicker/PickerTest.unity.meta similarity index 100% rename from Scripts/HSVPicker/PickerTest.unity.meta rename to Examples/HSVPicker/PickerTest.unity.meta diff --git a/README.md b/README.md index c311d90..00851a7 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ There are almost 70 extension controls / effect and other utilities in the proje ------|------|------|------| Accordion|HSVPicker|SelectionBox|UIButton|UIFlippable ComboBox|AutoCompleteComboBox|DropDownList|BoundToolTip|UIWindowBase -UI_Knob|TextPic||| +UI_Knob|TextPic|InputFocus|ImageExtended| |||| [Primitives](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Primitives)||||| @@ -135,9 +135,9 @@ AimerInputModule|GamePadInputModule||| [Additional Components](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Additional_Components)||||| ------|------|------|------| ReturnKeyTrigger|TabNavigation|uGUITools|ScrollRectTweener|ScrollRectLinker -ScrollRectEx|InputFocus|ImageExtended|UIScrollToSelection|UISelectableExtension +ScrollRectEx|UI_InfiniteScroll|UI_ScrollRectOcclusion|UIScrollToSelection|UISelectableExtension switchToRectTransform|ScrollConflictManager|CLFZ2 (Encryption)|Serialization|DragCorrector -PPIViewer|UI_TweenScale|UI_ScrollRectOcclusion|UI_InfiniteScroll| +PPIViewer|UI_TweenScale||| |||| *More to come* diff --git a/Scripts/HSVPicker/ColorPickerTester.cs b/Scripts/Controls/HSVPicker/ColorPickerTester.cs similarity index 100% rename from Scripts/HSVPicker/ColorPickerTester.cs rename to Scripts/Controls/HSVPicker/ColorPickerTester.cs diff --git a/Scripts/HSVPicker/ColorPickerTester.cs.meta b/Scripts/Controls/HSVPicker/ColorPickerTester.cs.meta similarity index 100% rename from Scripts/HSVPicker/ColorPickerTester.cs.meta rename to Scripts/Controls/HSVPicker/ColorPickerTester.cs.meta diff --git a/Scripts/HSVPicker/HSVPicker.cs b/Scripts/Controls/HSVPicker/HSVPicker.cs similarity index 100% rename from Scripts/HSVPicker/HSVPicker.cs rename to Scripts/Controls/HSVPicker/HSVPicker.cs diff --git a/Scripts/HSVPicker/HSVPicker.cs.meta b/Scripts/Controls/HSVPicker/HSVPicker.cs.meta similarity index 100% rename from Scripts/HSVPicker/HSVPicker.cs.meta rename to Scripts/Controls/HSVPicker/HSVPicker.cs.meta diff --git a/Scripts/HSVPicker/HSVSliderEvent.cs b/Scripts/Controls/HSVPicker/HSVSliderEvent.cs similarity index 100% rename from Scripts/HSVPicker/HSVSliderEvent.cs rename to Scripts/Controls/HSVPicker/HSVSliderEvent.cs diff --git a/Scripts/HSVPicker/HSVSliderEvent.cs.meta b/Scripts/Controls/HSVPicker/HSVSliderEvent.cs.meta similarity index 100% rename from Scripts/HSVPicker/HSVSliderEvent.cs.meta rename to Scripts/Controls/HSVPicker/HSVSliderEvent.cs.meta diff --git a/Scripts/HSVPicker/HSVUtil.cs b/Scripts/Controls/HSVPicker/HSVUtil.cs similarity index 100% rename from Scripts/HSVPicker/HSVUtil.cs rename to Scripts/Controls/HSVPicker/HSVUtil.cs diff --git a/Scripts/HSVPicker/HSVUtil.cs.meta b/Scripts/Controls/HSVPicker/HSVUtil.cs.meta similarity index 100% rename from Scripts/HSVPicker/HSVUtil.cs.meta rename to Scripts/Controls/HSVPicker/HSVUtil.cs.meta diff --git a/Scripts/HSVPicker/HexRGB.cs b/Scripts/Controls/HSVPicker/HexRGB.cs similarity index 100% rename from Scripts/HSVPicker/HexRGB.cs rename to Scripts/Controls/HSVPicker/HexRGB.cs diff --git a/Scripts/HSVPicker/HexRGB.cs.meta b/Scripts/Controls/HSVPicker/HexRGB.cs.meta similarity index 100% rename from Scripts/HSVPicker/HexRGB.cs.meta rename to Scripts/Controls/HSVPicker/HexRGB.cs.meta diff --git a/Scripts/HSVPicker/HsvBoxSelector.cs b/Scripts/Controls/HSVPicker/HsvBoxSelector.cs similarity index 100% rename from Scripts/HSVPicker/HsvBoxSelector.cs rename to Scripts/Controls/HSVPicker/HsvBoxSelector.cs diff --git a/Scripts/HSVPicker/HsvBoxSelector.cs.meta b/Scripts/Controls/HSVPicker/HsvBoxSelector.cs.meta similarity index 100% rename from Scripts/HSVPicker/HsvBoxSelector.cs.meta rename to Scripts/Controls/HSVPicker/HsvBoxSelector.cs.meta diff --git a/Scripts/HSVPicker/HsvSliderPicker.cs b/Scripts/Controls/HSVPicker/HsvSliderPicker.cs similarity index 100% rename from Scripts/HSVPicker/HsvSliderPicker.cs rename to Scripts/Controls/HSVPicker/HsvSliderPicker.cs diff --git a/Scripts/HSVPicker/HsvSliderPicker.cs.meta b/Scripts/Controls/HSVPicker/HsvSliderPicker.cs.meta similarity index 100% rename from Scripts/HSVPicker/HsvSliderPicker.cs.meta rename to Scripts/Controls/HSVPicker/HsvSliderPicker.cs.meta diff --git a/Scripts/Effects/ImageExtended.cs b/Scripts/Controls/ImageExtended.cs similarity index 100% rename from Scripts/Effects/ImageExtended.cs rename to Scripts/Controls/ImageExtended.cs diff --git a/Scripts/Effects/ImageExtended.cs.meta b/Scripts/Controls/ImageExtended.cs.meta similarity index 100% rename from Scripts/Effects/ImageExtended.cs.meta rename to Scripts/Controls/ImageExtended.cs.meta diff --git a/Scripts/Utilities/InputFocus.cs b/Scripts/Controls/InputFocus.cs similarity index 100% rename from Scripts/Utilities/InputFocus.cs rename to Scripts/Controls/InputFocus.cs diff --git a/Scripts/Utilities/InputFocus.cs.meta b/Scripts/Controls/InputFocus.cs.meta similarity index 100% rename from Scripts/Utilities/InputFocus.cs.meta rename to Scripts/Controls/InputFocus.cs.meta diff --git a/Scripts/Layout/ScrollSnap.cs b/Scripts/Layout/ScrollSnap.cs index bb432b1..0bb3e9f 100644 --- a/Scripts/Layout/ScrollSnap.cs +++ b/Scripts/Layout/ScrollSnap.cs @@ -1,13 +1,13 @@ /// Credit BinaryX /// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-1945602 /// Updated by ddreaper - removed dependency on a custom ScrollRect script. Now implements drag interfaces and standard Scroll Rect. -/// Update by xesenix - rewrited almost entire code -/// - configuration for direction move instead of 2 concurrent class (easiear to change direction in editor) -/// - supports list layouted with horizontal or vertical layout need to match direction with type of layout used -/// - dynamicly checks if scrolled list size changes and recalculates anchor positions +/// Update by xesenix - rewrote almost the entire code +/// - configuration for direction move instead of 2 concurrent class (easier to change direction in editor) +/// - supports list layout with horizontal or vertical layout need to match direction with type of layout used +/// - dynamic checks if scrolled list size changes and recalculates anchor positions /// and item size based on itemsVisibleAtOnce and size of root container -/// if you dont wish to use this auto resize turn of autoLayoutItems -/// - fixed current page made it independant from pivot +/// if you don't wish to use this auto resize turn of autoLayoutItems +/// - fixed current page made it independent from pivot /// - replaced pagination with delegate function using System; using UnityEngine.EventSystems; @@ -19,7 +19,7 @@ namespace UnityEngine.UI.Extensions [AddComponentMenu("UI/Extensions/Scroll Snap")] public class ScrollSnap : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler { - // needed becouse of reversed behavior of axis Y compared to X + // needed because of reversed behaviour of axis Y compared to X // (positions of children lower in children list in horizontal directions grows when in vertical it gets smaller) public enum ScrollDirection { diff --git a/Scripts/ToolTips/HoverTooltip.cs b/Scripts/ToolTips/HoverTooltip.cs index 3022c46..ffc7b84 100644 --- a/Scripts/ToolTips/HoverTooltip.cs +++ b/Scripts/ToolTips/HoverTooltip.cs @@ -3,6 +3,7 @@ namespace UnityEngine.UI.Extensions { + [AddComponentMenu("UI/Extensions/HoverTooltip")] public class HoverTooltip : MonoBehaviour { //manually selectable padding for the background image