Merged in development (pull request #106)

Release 2.2.3

Author: SimonDarksideJTest

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "Examples"]
-	path = Examples
-	url = https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/branch/Examples
+[submodule "Examples~"]
+	path = Examples~
+	url = https://SimonDarksideJ@bitbucket.org/UnityUIExtensions/unity-ui-extensions.git
 	branch = Examples

.npmignore

@@ -4,46 +4,55 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## 2019.4 (v2.2) - 2020-07-09
+## 2019.5 (v2.3) - 2020-10-31
 
-Here we write upgrading notes for brands. It's a team effort to make them as
-straightforward as possible.
+Since the move to UPM, the team have been able to react quicker and push out fixes a lot easier, without affecting previous installation (whilst still adhering to Unity's backwards compatibility pattern).  So it is with great news we announce this new release, faster that ever :D  (and thanks to UPM, easier to upgrade than ever).
+Be sure to also check out the "Examples" option in the Package Manager window to import the samples to your project.
 
 ### Added
 
-- New UPM deployment for Unity 2019, 2018 will still need to use the asset packages due to Unity compatibility issues.
-- Updated the project to the new Unity packaging guidelines, including separating out the examples to a separate package.
-- Many line drawing updates, including the ability to draw using a mouse (check the examples)
-- New Unity Card UI controls thanks to @RyanslikeSoCool
+- Add squircle primitive
+- Adding new magnetic scroll control
+- Added a static library to collate shaders on first use.
+- Finalized new InputManagerHelper, which translates input based on the operating input system, new or old Updated CardStack2D to have defined keyboard input or specific gamepad input over the older axisname for new input system.
+- Updated DropDown and Autocomplete controls based on feedback in #204
 
 ### Changed
 
-- Scroll Snaps (HSS/VSS) now have a "Hard Swipe" feature to restrict movement to a single page for each swipe
-- Scroll Snaps have also been updated to work better with the UIInfiniteScroll control
-- Update to the Fancy Scroll controls with even more added fanciness
-- Several updates to adopt newer Unity standards in the controls to ensure full forwards and backwards compatibility  
+- Examples now included with UPM delivery and available as a button on the UPM package manager window
+- Updated DropDown and Autocomplete controls based on feedback in #204
+- Updated Accordion to support both Vertical as well as Horizontal layout
+- Updated ComboBox controls to improve better programmatic controls
+- Updates to the Infinite scroll to support content of various sizes
+- Updated UI Knob control - enabled dragging outside the target area, added example scene
+- Minor update to MagneticInfinite Scroll
+- Refactored and extended the ContentScrollSnap control
+- Added protection against errors and empty scrollrect content
+- Added new SetNewItems function to add children programmatically to the control and reset accordingly
+- Patch supplied by a contributor to improve the texture sheet use with the UIParticlesystem
+- Added "SetKnobValue" function which allows the setting of Value and loops
+- Added the programmatic capability to change the parent scroll rect on the ScrollConflictManager at runtime.
 
 ### Deprecated
 
 None
 
 ### Fixed
 
-- Mouse position use updated in
-    * RadialSlider
-    * ColorSampler
-    * TiltWindow
-- Check compiler warnings (#197)
-- Line Renderer click to add lines (#183)
-- ScrollSnap Swiping options - hard fast swipe (#176)
-- Shader Loading issue / UIParticleSystem (#229)
-- Issue where Menu Prefabs would be disabled instead of their Clones (#210)
-- Check ScrollSnapBase update (#265)
-- UIInfiniteScroller support for VSS updated and fixes
-- Fix to allow radial slider to start from positions other than left
-- Fix UI Particles: Texture sheet animation + Random row(#256)
-- Fix for wandering ScrollSnap controls due to Local Positioning drift
-- Divide By Zero fix for Gradient (#58)
+- Fix to add a "RequireComponent" to Primitives as Unity 2020 does not add them by default
+- Remove old Examples submodule
+- Updated submodules to hide Examples folder Additionally, updated Package manifest to allow importing of examples direct from UPM package.
+- Fixed hard swipe to ensure it only ever moves one page, no matter how far you swipe.
+- Fixed a conflict when using the ScrollConflictManager in child content of a HSS or VSS
+- Fix for UI Particle system looping
+- Fixed public GoToScreen call to only raise events internally (not multiple)
+- Final roll-up and fix. Resolved race condition for associated pagination controls.
+- Fixed issue with page events not being raised when inertia was disabled (velocity was always zero)
+- When cloned, reorderable list was creating a second List Content component that was not initialized. Refactored to ensure only one list content was present and is initialized correctly
+- Reorderable list items marked as transferable, remain transferable after being dropped
+- Patch to resolve issues without the new Input System installed
+- Refined magnetic scroll and dependencies while documenting Updated example
+- Patch Tooltip
 
 ### Removed
 

CHANGELOG.md

@@ -8,7 +8,7 @@ The Unity UI Extensions project is a collection of extension scripts/effects and
 > Contact the UI Extensions Team
 > Be sure to logon to the new [Gitter Chat site](https://gitter.im/Unity-UI-Extensions/Lobby) for the UI Extensions project, if you have any questions, queries or suggestions
 > Much easier than posting a question / issue on [YouTube](http://www.youtube.com/c/UnityUIExtensions), [Twitter](https://twitter.com/hashtag/UnityUIExtensions) or [Facebook](https://www.facebook.com/UnityUIExtensions) :D
-> 
+>
 > [**UIExtensions Gitter Chanel**](https://gitter.im/Unity-UI-Extensions/Lobby)
 
 # Installing Unity UI Extensions
@@ -31,28 +31,70 @@ For a full list of the controls and how they are used, please see the [online do
 
 This version of the Unity UI Extensions is compatible with the following versions of the Unity Editor:
 
-* 2019 and above - the recommended path for 2019+ is to use the Unity Package Manager to get access to the package.  Full details for installing via UPM can be [found here](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/UPMInstallation).
+- 2019 and above - the recommended path for 2019+ is to use the Unity Package Manager to get access to the package.  Full details for installing via UPM can be [found here](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/UPMInstallation).
 
 > Alternatively, the Asset packages have been tested to work with 2019 as well if you prefer to install that way.
 
-* 2018 and below - for 2018 and use this package, you will have to import the asset package(s), either from the Asset Store or from the alternate download locations [listed here](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Downloads).
+- 2018 and below - for 2018 and use this package, you will have to import the asset package(s), either from the Asset Store or from the alternate download locations [listed here](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Downloads).
 
 ## [Release Notes](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/ReleaseNotes/RELEASENOTES)
 
-### 2019.4 - 2.2  - Back from the future
-
-* New UPM deployment for Unity 2019, 2018 will still need to use the asset packages due to Unity compatibility issues.
-* Updated the project to the new Unity packaging guidelines, including separating out the examples to a separate package.
-* Many line drawing updates, including the ability to draw using a mouse (check the examples)
-* Scroll Snaps (HSS/VSS) now have a "Hard Swipe" feature to restrict movement to a single page for each swipe
-* Scroll Snaps have also been updated to work better with the UIInfiniteScroll control
-* New Unity Card UI controls thanks to @RyanslikeSoCool
-* Update to the Fancy Scroll controls with even more added fanciness
-* Several updates to adopt newer Unity standards in the controls to ensure full forwards and backwards compatibility
+### 2019.5 - 2.3  - Accelerated Deployment
+
+#### Added
+
+- Add squircle primitive
+- Adding new magnetic scroll control
+- Added a static library to collate shaders on first use.
+- Finalized new InputManagerHelper, which translates input based on the operating input system, new or old Updated CardStack2D to have defined keyboard input or specific gamepad input over the older axisname for new input system.
+- Updated DropDown and Autocomplete controls based on feedback in #204
+
+#### Changed
+
+- Examples now included with UPM delivery and available as a button on the UPM package manager window
+- Updated DropDown and Autocomplete controls based on feedback in #204
+- Updated Accordion to support both Vertical as well as Horizontal layout
+- Updated ComboBox controls to improve better programmatic controls
+- Updates to the Infinite scroll to support content of various sizes
+- Updated UI Knob control - enabled dragging outside the target area, added example scene
+- Minor update to MagneticInfinite Scroll
+- Refactored and extended the ContentScrollSnap control
+- Added protection against errors and empty scrollrect content
+- Added new SetNewItems function to add children programmatically to the control and reset accordingly
+- Patch supplied by a contributor to improve the texture sheet use with the UIParticlesystem
+- Added "SetKnobValue" function which allows the setting of Value and loops
+- Added the programmatic capability to change the parent scroll rect on the ScrollConflictManager at runtime.
+
+#### Deprecated
+
+None
+
+#### Fixed
+
+- Fix to add a "RequireComponent" to Primitives as Unity 2020 does not add them by default
+- Remove old Examples submodule
+- Updated submodules to hide Examples folder Additionally, updated Package manifest to allow importing of examples direct from UPM package.
+- Fixed hard swipe to ensure it only ever moves one page, no matter how far you swipe.
+- Fixed a conflict when using the ScrollConflictManager in child content of a HSS or VSS
+- Fix for UI Particle system looping
+- Fixed public GoToScreen call to only raise events internally (not multiple)
+- Final roll-up and fix. Resolved race condition for associated pagination controls.
+- Fixed issue with page events not being raised when inertia was disabled (velocity was always zero)
+- When cloned, reorderable list was creating a second List Content component that was not initialized. Refactored to ensure only one list content was present and is initialized correctly
+- Reorderable list items marked as transferable, remain transferable after being dropped
+- Patch to resolve issues without the new Input System installed
+- Refined magnetic scroll and dependencies while documenting Updated example
+- Patch Tooltip
+
+#### Removed
+
+None
 
 # Document revision history
 
 |Date|Details|
 |-|-|
 |July 9th, 2020|2019.4 (v2.2) released, first UPM deployment live |
-|September 3rd, 2019|2019.1 (v2.1) released, First major update for the 2.0 series.|
+|September 3rd, 2019|2019.1 (v2.1) released, First major update for the 2.0 series.|
+|August 8th, 2020|2019.4 (v2.2) released, New UPM Delivery.|
+|October 10th, 2020|2019.5 (v2.2) released, New UPM fast delivery|

Documentation~/com.unity.uiextensions.md

@@ -708,33 +708,78 @@ static public void AddUIWindowBase(MenuCommand menuCommand)
 			go.AddComponent<Image>();
 			Selection.activeGameObject = go;
 		}
-        #endregion
+		#endregion
 
-        #region Accordion
-        [MenuItem("GameObject/UI/Extensions/Accordion/Accordion Group", false)]
-		static public void AddAccordionGroup(MenuCommand menuCommand)
+		#region Accordion
+		[MenuItem("GameObject/UI/Extensions/Accordion/Accordion", false)]
+		static public void AddAccordionVertical(MenuCommand menuCommand)
 		{
 			GameObject go = CreateUIElementRoot("Accordion Group", menuCommand, s_ThickGUIElementSize);
-			go.AddComponent<VerticalLayoutGroup>();
-			go.AddComponent<ContentSizeFitter>();
-			go.AddComponent<ToggleGroup>();
-			go.AddComponent<Accordion>();
+			CreateAccordionGroup(go);
+            for (int i = 0; i < 3; i++)
+            {
+				GameObject child = CreateUIObject($"Accordion Element {i}", go);
+				CreateAccordionElement(child);
+			}
 			Selection.activeGameObject = go;
 		}
 
-		[MenuItem("GameObject/UI/Extensions/Accordion/Accordion Element", false)]
+		[MenuItem("GameObject/UI/Extensions/Accordion/Accordion Group", false)]
+		static public void AddAccordionGroup(MenuCommand menuCommand)
+        {
+            GameObject go = CreateUIElementRoot("Accordion Group", menuCommand, s_ThickGUIElementSize);
+            CreateAccordionGroup(go);
+            Selection.activeGameObject = go;
+        }
+
+        private static void CreateAccordionGroup(GameObject go)
+        {
+            var vlg = go.AddComponent<VerticalLayoutGroup>();
+            vlg.childControlHeight = true;
+            vlg.childControlWidth = true;
+            vlg.childForceExpandHeight = false;
+            vlg.childForceExpandHeight = true;
+            var csf = go.AddComponent<ContentSizeFitter>();
+            csf.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            go.AddComponent<ToggleGroup>();
+            go.AddComponent<Accordion>();
+        }
+
+        [MenuItem("GameObject/UI/Extensions/Accordion/Accordion Element", false)]
 		static public void AddAccordionElement(MenuCommand menuCommand)
-		{
-			GameObject go = CreateUIElementRoot("Accordion Element", menuCommand, s_ThickGUIElementSize);
-			go.AddComponent<LayoutElement>();
-			go.AddComponent<AccordionElement>();
-			Selection.activeGameObject = go;
+        {
+            GameObject go = CreateUIElementRoot("Accordion Element", menuCommand, s_ThickGUIElementSize);
+            CreateAccordionElement(go);
 
-		}
-		#endregion
+            Selection.activeGameObject = go;
+        }
+
+        private static void CreateAccordionElement(GameObject go)
+        {
+            var vlg = go.AddComponent<VerticalLayoutGroup>();
+            vlg.childControlHeight = true;
+            vlg.childControlWidth = true;
+            vlg.childForceExpandHeight = false;
+            vlg.childForceExpandHeight = true;
+            go.AddComponent<LayoutElement>();
+            var accordionElement = go.AddComponent<AccordionElement>();
+
+            // Header
+            GameObject headergo = CreateUIObject("Header", go);
+            var headerLayout = headergo.AddComponent<LayoutElement>();
+            headerLayout.minHeight = accordionElement.MinHeight;
+            var headerText = headergo.AddComponent<Text>();
+            headerText.text = "This is an Accordion header";
+
+            // Text
+            GameObject textgo = CreateUIObject("Text", go);
+            var textText = textgo.AddComponent<Text>();
+            textText.text = "This is an example of text in an accordion element\nLots of information can be put here for selection\nIf you like";
+        }
+        #endregion
 
-		#region Drop Down controls
-		[MenuItem("GameObject/UI/Extensions/AutoComplete ComboBox", false)]
+        #region Drop Down controls
+        [MenuItem("GameObject/UI/Extensions/AutoComplete ComboBox", false)]
 		static public void AddAutoCompleteComboBox(MenuCommand menuCommand)
 		{
 			GameObject autoCompleteComboBoxRoot = CreateUIElementRoot("AutoCompleteComboBox", menuCommand, s_ThickGUIElementSize);
@@ -1208,6 +1253,14 @@ static public void AddUILineTextureRenderer(MenuCommand menuCommand)
 			Selection.activeGameObject = go;
 		}
 
+        [MenuItem("GameObject/UI/Extensions/Primitives/UI Squircle", false)]
+		static public void AddUISquircle(MenuCommand menuCommand)
+		{
+			GameObject go = CreateUIElementRoot("UI Squircle", menuCommand, s_ImageGUIElementSize);
+			go.AddComponent<UISquircle>();
+			Selection.activeGameObject = go;
+		}
+
 		[MenuItem("GameObject/UI/Extensions/Primitives/UI Circle", false)]
 		static public void AddUICircle(MenuCommand menuCommand)
 		{

Editor/UIExtensionsMenuOptions.cs

@@ -1,21 +1,22 @@
-Unity UI Extensions License (BSD3)
+# Unity UI Extensions License (BSD3)
+
 Copyright (c) 2019
 
-Redistribution and use in source and binary forms, with or without modification, 
+Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer 
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
    in the documentation and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived 
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
    from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.