From 35b88a248759ec0697c9181af5a97413c60ac6eb Mon Sep 17 00:00:00 2001 From: Simon Jackson Date: Fri, 5 May 2017 14:25:48 +0100 Subject: [PATCH] Fixed Line endings on shaders (?) Removed unnecessary usings (who knew there were so many, I'm normally so tidy :P) --- Editor/AccordionElementEditor.cs | 2 +- Editor/BezierLineRendererEditor.cs | 4 +--- Editor/UIExtensionsMenuOptions.cs | 8 ++++---- .../UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs | 1 - Scripts/Controls/Accordion/Accordion.cs | 2 +- Scripts/Controls/Accordion/AccordionElement.cs | 2 +- Scripts/Controls/Accordion/Tweening/FloatTween.cs | 3 +-- Scripts/Controls/Accordion/Tweening/ITweenValue.cs | 3 +-- Scripts/Controls/Accordion/Tweening/TweenRunner.cs | 8 ++++---- Scripts/Controls/ColorPicker/ColorImage.cs | 3 +-- Scripts/Controls/ColorPicker/ColorLabel.cs | 3 +-- Scripts/Controls/ColorPicker/ColorPickerPresets.cs | 1 - Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs | 4 ++-- Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs | 3 +-- Scripts/Controls/ColorPicker/HexColorField.cs | 2 +- Scripts/Controls/ColorPicker/SVBoxSlider.cs | 1 - Scripts/Controls/ColorPicker/TiltWindow.cs | 3 +-- Scripts/Controls/ComboBox/AutoCompleteComboBox.cs | 4 ++-- Scripts/Controls/ComboBox/DropDownList.cs | 8 ++++---- Scripts/Controls/ReorderableList/ReorderableList.cs | 2 -- .../Controls/ReorderableList/ReorderableListElement.cs | 1 - Scripts/Controls/RescalingPanels/RescaleDragPanel.cs | 2 +- Scripts/Controls/RescalingPanels/RescalePanel.cs | 2 +- Scripts/Controls/RescalingPanels/ResizePanel.cs | 2 +- Scripts/Controls/SelectionBox/IBoxSelectable.cs | 6 +++--- Scripts/Controls/SelectionBox/SelectionBox.cs | 4 ++-- Scripts/Effects/Gradient2.cs | 2 +- Scripts/Effects/LetterSpacing.cs | 2 +- Scripts/Effects/MonoSpacing.cs | 2 +- Scripts/Effects/NicerOutline.cs | 4 ++-- Scripts/Effects/UIFlippable.cs | 3 --- Scripts/Layout/CurvedLayout.cs | 3 ++- Scripts/Layout/FlowLayoutGroup.cs | 8 ++++---- Scripts/Layout/ScrollSnapBase.cs | 2 +- Scripts/Layout/TileSizeFitter.cs | 1 - Scripts/Primitives/UICornerCut.cs | 3 ++- Scripts/Primitives/UIGridRenderer.cs | 3 +-- Scripts/Primitives/UILineRenderer.cs | 2 +- Scripts/Primitives/UILineTextureRenderer.cs | 2 +- Scripts/ToolTips/BoundTooltip/BoundTooltipTrigger.cs | 2 +- Scripts/Utilities/ExtensionsToggleGroup.cs | 4 ++-- Scripts/Utilities/ScrollRectEx.cs | 2 +- .../Serialization/Surrogates/GameObjectSurrogate.cs | 2 -- .../Serialization/Surrogates/Texture2DSurrogate.cs | 2 -- .../Serialization/Surrogates/TransformSurrogate.cs | 2 -- Scripts/Utilities/TestCompression.cs | 1 - Scripts/Utilities/UIScrollToSelection.cs | 4 ++-- Scripts/VR Extensions/VRCursor.cs | 1 - Shaders/SoftMaskShader.shader | 6 ++++-- Shaders/UIAdditive.shader | 6 ++++-- Shaders/UIImageCrop.shader | 6 ++++-- Shaders/UILinearDodge.shader | 6 ++++-- Shaders/UIMultiply.shader | 6 ++++-- Shaders/UIScreen.shader | 6 ++++-- Shaders/UISoftAdditive.shader | 6 ++++-- 55 files changed, 86 insertions(+), 97 deletions(-) diff --git a/Editor/AccordionElementEditor.cs b/Editor/AccordionElementEditor.cs index 92e53f4..6bccf1c 100644 --- a/Editor/AccordionElementEditor.cs +++ b/Editor/AccordionElementEditor.cs @@ -5,7 +5,7 @@ using UnityEngine.UI.Extensions; namespace UnityEditor.UI { - [CustomEditor(typeof(AccordionElement), true)] + [CustomEditor(typeof(AccordionElement), true)] public class AccordionElementEditor : ToggleEditor { public override void OnInspectorGUI() diff --git a/Editor/BezierLineRendererEditor.cs b/Editor/BezierLineRendererEditor.cs index 471d281..d3ab130 100644 --- a/Editor/BezierLineRendererEditor.cs +++ b/Editor/BezierLineRendererEditor.cs @@ -1,9 +1,7 @@ ///Credit Jason Horsburgh ///Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/127/uilinerenderer-mesh-not-updating-in-editor - using UnityEditor; -using UnityEngine; -using UnityEngine.UI.Extensions; +using UnityEditor; namespace UnityEngine.UI.Extensions { diff --git a/Editor/UIExtensionsMenuOptions.cs b/Editor/UIExtensionsMenuOptions.cs index abc65db..f38b687 100644 --- a/Editor/UIExtensionsMenuOptions.cs +++ b/Editor/UIExtensionsMenuOptions.cs @@ -5,11 +5,11 @@ using UnityEngine.UI.Extensions; namespace UnityEditor.UI { - /// - /// This script adds the Extensions UI menu options to the Unity Editor. - /// + /// + /// This script adds the Extensions UI menu options to the Unity Editor. + /// - static internal class ExtensionMenuOptions + static internal class ExtensionMenuOptions { #region Unity Builder section - Do not change unless UI Source (Editor\MenuOptions) changes #region Unity Builder properties - Do not change unless UI Source (Editor\MenuOptions) changes diff --git a/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs b/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs index eb6c2ef..acd5d25 100644 --- a/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs +++ b/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs @@ -7,7 +7,6 @@ using UnityEngine; using UnityEngine.UI; -using System; using UnityEngine.UI.Extensions; diff --git a/Scripts/Controls/Accordion/Accordion.cs b/Scripts/Controls/Accordion/Accordion.cs index 7eb3dc4..88b43f7 100644 --- a/Scripts/Controls/Accordion/Accordion.cs +++ b/Scripts/Controls/Accordion/Accordion.cs @@ -4,7 +4,7 @@ namespace UnityEngine.UI.Extensions { - [RequireComponent(typeof(VerticalLayoutGroup), typeof(ContentSizeFitter), typeof(ToggleGroup))] + [RequireComponent(typeof(VerticalLayoutGroup), typeof(ContentSizeFitter), typeof(ToggleGroup))] [AddComponentMenu("UI/Extensions/Accordion/Accordion Group")] public class Accordion : MonoBehaviour { diff --git a/Scripts/Controls/Accordion/AccordionElement.cs b/Scripts/Controls/Accordion/AccordionElement.cs index a2f7055..64f20e2 100644 --- a/Scripts/Controls/Accordion/AccordionElement.cs +++ b/Scripts/Controls/Accordion/AccordionElement.cs @@ -6,7 +6,7 @@ using UnityEngine.UI.Extensions.Tweens; namespace UnityEngine.UI.Extensions { - [RequireComponent(typeof(RectTransform), typeof(LayoutElement))] + [RequireComponent(typeof(RectTransform), typeof(LayoutElement))] [AddComponentMenu("UI/Extensions/Accordion/Accordion Element")] public class AccordionElement : Toggle { diff --git a/Scripts/Controls/Accordion/Tweening/FloatTween.cs b/Scripts/Controls/Accordion/Tweening/FloatTween.cs index 0378300..9ebf83a 100644 --- a/Scripts/Controls/Accordion/Tweening/FloatTween.cs +++ b/Scripts/Controls/Accordion/Tweening/FloatTween.cs @@ -1,12 +1,11 @@ ///Credit ChoMPHi ///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/ -using System.Collections; using UnityEngine.Events; namespace UnityEngine.UI.Extensions.Tweens { - public struct FloatTween : ITweenValue + public struct FloatTween : ITweenValue { public class FloatTweenCallback : UnityEvent {} public class FloatFinishCallback : UnityEvent {} diff --git a/Scripts/Controls/Accordion/Tweening/ITweenValue.cs b/Scripts/Controls/Accordion/Tweening/ITweenValue.cs index 25d135b..ab20ec4 100644 --- a/Scripts/Controls/Accordion/Tweening/ITweenValue.cs +++ b/Scripts/Controls/Accordion/Tweening/ITweenValue.cs @@ -1,11 +1,10 @@ ///Credit ChoMPHi ///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/ -using System.Collections; namespace UnityEngine.UI.Extensions.Tweens { - internal interface ITweenValue + internal interface ITweenValue { void TweenValue(float floatPercentage); bool ignoreTimeScale { get; } diff --git a/Scripts/Controls/Accordion/Tweening/TweenRunner.cs b/Scripts/Controls/Accordion/Tweening/TweenRunner.cs index 8a3a8e3..d07b3d2 100644 --- a/Scripts/Controls/Accordion/Tweening/TweenRunner.cs +++ b/Scripts/Controls/Accordion/Tweening/TweenRunner.cs @@ -5,10 +5,10 @@ using System.Collections; namespace UnityEngine.UI.Extensions.Tweens { - // Tween runner, executes the given tween. - // The coroutine will live within the given - // behaviour container. - internal class TweenRunner where T : struct, ITweenValue + // Tween runner, executes the given tween. + // The coroutine will live within the given + // behaviour container. + internal class TweenRunner where T : struct, ITweenValue { protected MonoBehaviour m_CoroutineContainer; protected IEnumerator m_Tween; diff --git a/Scripts/Controls/ColorPicker/ColorImage.cs b/Scripts/Controls/ColorPicker/ColorImage.cs index f066873..99bd786 100644 --- a/Scripts/Controls/ColorPicker/ColorImage.cs +++ b/Scripts/Controls/ColorPicker/ColorImage.cs @@ -1,11 +1,10 @@ ///Credit judah4 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ -using System.Globalization; namespace UnityEngine.UI.Extensions.ColorPicker { -[RequireComponent(typeof(Image))] + [RequireComponent(typeof(Image))] public class ColorImage : MonoBehaviour { public ColorPickerControl picker; diff --git a/Scripts/Controls/ColorPicker/ColorLabel.cs b/Scripts/Controls/ColorPicker/ColorLabel.cs index babeb81..adbb806 100644 --- a/Scripts/Controls/ColorPicker/ColorLabel.cs +++ b/Scripts/Controls/ColorPicker/ColorLabel.cs @@ -1,12 +1,11 @@ ///Credit judah4 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ -using System.Globalization; namespace UnityEngine.UI.Extensions.ColorPicker { -[RequireComponent(typeof(Text))] + [RequireComponent(typeof(Text))] public class ColorLabel : MonoBehaviour { public ColorPickerControl picker; diff --git a/Scripts/Controls/ColorPicker/ColorPickerPresets.cs b/Scripts/Controls/ColorPicker/ColorPickerPresets.cs index 28ac24e..3511741 100644 --- a/Scripts/Controls/ColorPicker/ColorPickerPresets.cs +++ b/Scripts/Controls/ColorPicker/ColorPickerPresets.cs @@ -1,7 +1,6 @@ ///Credit judah4 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ -using System.Globalization; namespace UnityEngine.UI.Extensions.ColorPicker { diff --git a/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs b/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs index 0138920..537a86d 100644 --- a/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs +++ b/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs @@ -1,5 +1,5 @@ -using UnityEngine; -using System; +using System; +using UnityEngine; using UnityEngine.Events; [Serializable] diff --git a/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs b/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs index 7a393c1..b7a90d6 100644 --- a/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs +++ b/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs @@ -1,5 +1,4 @@ -using UnityEngine; -using UnityEngine.Events; +using UnityEngine.Events; public class HSVChangedEvent : UnityEvent { diff --git a/Scripts/Controls/ColorPicker/HexColorField.cs b/Scripts/Controls/ColorPicker/HexColorField.cs index 403ca63..ba43ac5 100644 --- a/Scripts/Controls/ColorPicker/HexColorField.cs +++ b/Scripts/Controls/ColorPicker/HexColorField.cs @@ -6,7 +6,7 @@ using System.Globalization; namespace UnityEngine.UI.Extensions.ColorPicker { -[RequireComponent(typeof(InputField))] + [RequireComponent(typeof(InputField))] public class HexColorField : MonoBehaviour { public ColorPickerControl ColorPicker; diff --git a/Scripts/Controls/ColorPicker/SVBoxSlider.cs b/Scripts/Controls/ColorPicker/SVBoxSlider.cs index 7ae0a08..3c26ac8 100644 --- a/Scripts/Controls/ColorPicker/SVBoxSlider.cs +++ b/Scripts/Controls/ColorPicker/SVBoxSlider.cs @@ -1,7 +1,6 @@ ///Credit judah4 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ -using System.Globalization; namespace UnityEngine.UI.Extensions.ColorPicker { diff --git a/Scripts/Controls/ColorPicker/TiltWindow.cs b/Scripts/Controls/ColorPicker/TiltWindow.cs index e28fa0e..98f6d8a 100644 --- a/Scripts/Controls/ColorPicker/TiltWindow.cs +++ b/Scripts/Controls/ColorPicker/TiltWindow.cs @@ -1,11 +1,10 @@ ///Credit judah4 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ -using System.Globalization; namespace UnityEngine.UI.Extensions { -public class TiltWindow : MonoBehaviour + public class TiltWindow : MonoBehaviour { public Vector2 range = new Vector2(5f, 3f); diff --git a/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs b/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs index 323e731..98f2379 100644 --- a/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs +++ b/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs @@ -22,7 +22,7 @@ namespace UnityEngine.UI.Extensions private InputField _mainInput; private RectTransform _inputRT; - private Button _arrow_Button; + //private Button _arrow_Button; private RectTransform _rectTransform; @@ -136,7 +136,7 @@ namespace UnityEngine.UI.Extensions _inputRT = _rectTransform.FindChild("InputField").GetComponent(); _mainInput = _inputRT.GetComponent(); - _arrow_Button = _rectTransform.FindChild ("ArrowBtn").GetComponent