Commit Graph

84 Commits (b3e4b0fcd514ca2ced828a7986bbc2dad3b0e1e4)

Author SHA1 Message Date
Ben MacKinnon cea147dc75 Added Range Slider controller. Squashed commit of previous work.
commit 6c5cf2dc036cf385b81fdfc8072300704b06b435
Merge: fb991af bf30261
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 17:54:34 2019 +0000

    Merge branch 'refs/heads/master' into range-slider

commit bf302616b8ae377a859d2012b856dc370efe40c2
Merge: 10919c6 76d2299
Author: Ben MacKinnon <bilmackinnon@googlemail.com>
Date:   Tue Nov 12 17:44:57 2019 +0000

    Merge pull request #1 from Dover8/range-slider

    Range slider

commit 76d22998d38801ab35ba19743d944263041924a5
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 17:36:23 2019 +0000

    Updated PointerDown to update the target graphic

    Re-enabling colour tint interaction.

commit 2d2ca219d5c0865ba4eaa428e8a167118aa06360
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:59:29 2019 +0000

    Updated headers to match the standard format of the project

commit 9a0d3f4aaddbcee2565693b0733c0001a2de2a90
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:43:22 2019 +0000

    Some further default value set when creating a RangeSlider

commit 748d1484568e16aa0bd2e3949330e48ce7245570
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:38:34 2019 +0000

    Added the menu creation options for the Range Slider

commit fa9e9beceede8c708529cd6a3ea98673b2d6d2c2
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 12:55:38 2019 +0000

    Editor layout for the Range Slider

    Using the EditorGUILayout.MinMaxSlider to control the RangeSlider. It was this control that we are replicating in the UI.

commit 32b731548e8e7f286964a4a7a35fd945e5d5a31a
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Mon Nov 11 16:19:16 2019 +0000

    Updated namespace and header

commit 4d0fa2e7dc535b343cf10def6e01886383cc88ac
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Mon Sep 16 12:41:45 2019 +0100

    Added interaction

    Range slider is now interactable with both handles and the bar

commit f4be93752719a08b95594e545eb16b27d3b3bcea
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Fri Sep 13 15:27:15 2019 +0100

    copied over the WIP RangeSlider from current project
2019-11-13 11:09:37 +00:00
Simon (darkside) Jackson 35995015bc Updating project for 2019 and adding assembly definitions for dev
Plus minor 2019 fix for textpic
2019-08-14 11:10:38 +01:00
Brad Nelson 1d5bfd7e30 Merged in playemgames/unity-ui-extensions-7/Brad-Nelson/minor-fix-for-newer-unity-versions-1563051919060 (pull request #53)
Minor fix for newer Unity versions.

Approved-by: Brad Nelson <info@play-em.com>
2019-08-13 20:30:49 +00:00
sushanta chakraborty 3e580876b1 TextPic.cs edited online with Bitbucket
1. Solved 2 null reference exception, one where inspectorIconList is null at first when you create a TextPic.cs object directly from the menu. And another at GetOutputText() function where sometime count gets higher then m_HrefInfos.Count.
2019-08-10 18:00:55 +00:00
Brad Nelson 1bc5bab70b Minor fix for newer Unity versions. 2019-07-13 21:05:42 +00:00
Brad Nelson 9496fcc0e6 Code cleanup of TextPic, fixes for text rendering with Unity 2019.1.5 and above. Made a default function for hyperlink text to work out of the box with a function OnHrefClick to override with own custom functionality if desired. Optimizations and caching of variables. 2019-06-10 10:23:50 +00:00
Jesús González 61aab3765b Reorderable lists now have a new field "EqualizeSizesOnDrag", default to false. When it is true it sets every item size (when being dragged over the current list) to the current size of the first element of the list.
true was the default behaviour before, and it might be useful in some cases so I left the option there, but in most use cases I encountered so far, and according to Issue 268 (https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/268/re-orderable-lists-different-width-height) the false behaviour is expected.
2019-04-10 09:43:17 -04:00
Jesús González 93f9a314cf Added a new Event to ReorderableList: OnElementDroppedWithMaxItems.
It is called when an object is dropped on a ReorderableList with no more space left (currentItems >= maxItems).
2019-04-09 20:35:34 -04:00
Simon (Darkside) Jackson 43eaa870e1 Resolved a number of .NET warnings and invalid properties 2019-03-07 18:11:51 +00:00
Brad Nelson 561cc87cf0 Fixes to TextPic to make sure images are culled properly. 2019-03-02 00:23:06 +00:00
LARS-LAPTOP2\larsme c8b7085f27 More Options for ReordableList:
- Max item count, after which no more items can be dropped
- IsDisplacable option: If true, an item can be dropped into a full list by displacing one of its items,
  it may replace the dragged item in its origin list, be dropped in space or be deleted
  depending on the dragged item's origin list and the displaced item
- Added respective Events
- fixed ever increasing number of _listContent components
- Stopped dragged item from blocking Raycasts
2019-02-22 18:35:03 +01:00
StefanTBG 3814471a2b Updating the ReorderableList control to work with Screen Space - Overlay 2019-01-14 22:25:52 -05:00
Stefan Perales f92a516d9d Updating the ReorderableList control to work with Screen Space - Overlay 2019-01-14 22:05:27 -05:00
Simon (Darkside) Jackson 48d3c40623 Testing branch for 2018.3 2018-12-31 15:54:49 +00:00
Jesús González e82dd8dc6e Fixed: when moving an element from a Reorderable List to another one that's empty, the element size was being reset to the default 100,100. This also happened is moving any element to the start of a it current list.
This version of the fix is more correct, as it is only touching the ResetSizes() method.
2018-12-12 20:12:26 -03:00
Jesús González e35ff7d933 Fixed: when moving an element from a Reorderable List to another one that's empty, the element size was being reset to the default 100,100. This also happened is moving any element to the start of a it current list. 2018-12-12 20:06:27 -03:00
Gabriel Juchault c2b8b39fa1 fix(cooldown-button): add a fake event to avoid null buttonSource 2018-11-21 14:47:49 +00:00
Gabriel Juchault ff548fec7e fix(cooldown-button): restore event 2018-11-21 13:41:20 +00:00
Gabriel Juchault 3737c610b6 fix(cooldown-button): do not trigger event on StartCooldown as it can be triggered next to `StartCooldown` call 2018-11-21 13:14:32 +00:00
Gabriel Juchault 67c2da49b1 feat(cooldown-button): add a `StartCooldown` to start cooldown from outside 2018-11-21 13:11:30 +00:00
Simon (Darkside) Jackson d3fc02c475 Reapplying fixes after having to do a reset, whoops 2018-05-31 16:55:39 +01:00
Simon (Darkside) Jackson 4e6f14118f Updated ColorSampler and TiltWindow with multi-touch support.
Also resolved an annoying warning from the BoxSlider (Resolves #234)
2018-04-29 12:10:34 +01:00
Simon (Darkside) Jackson 8768fb6c8d Merge branch 'master' of https://bitbucket.org/UnityUIExtensions/unity-ui-extensions 2018-04-12 15:12:31 +01:00
Simon (Darkside) Jackson 18a61b5ef5 Updated Radial Slider to user event Pointer position instead of Input.MousePos, allows multiple radials to be use on touch screens.
Resolves #231
2018-04-12 15:12:17 +01:00
Leon Kyz 3b1929541a Merge branch 'master' of https://bitbucket.org/leonkj/unity-ui-extensions 2018-03-30 20:02:03 +03:00
Leon Kyz 3cd7b25707 Fix reorderable lists 2018-03-30 20:00:26 +03:00
Simon (Darkside) Jackson 6a4256738a Added Experimental update to UI Knob to enable working in World/SS-Camera. May revert.
Unity seems to calculate the mouse cursor position wrong between frames.
2018-03-24 14:48:53 +00:00
Sean Mann 4a2a4f555d Merged in Naphier/unity-ui-extensions_ng (pull request #30)
Further improvements to color picker control
2018-03-24 11:35:53 +00:00
Simon (Darkside) Jackson 1dbfda47d9 Moved Shader folder under a Resources folder to resolve UI Particle system and other shader issues.
Resolves #229
2018-03-22 18:09:48 +00:00
Sean Mann d5d94a2076 Improvements to UI and ColorPickerPresets inspector.
- Picker 2.0.prefab UI now collapses preoperly when showing/hiding HSV/RGB slider sets.
- ColorPickerPresets now has an inspector with a button that can be clicked to open the saved JSON file.
2018-03-10 21:52:45 -05:00
Sean Mann 8d4a2fe698 Compacted json format (was Color[] now is Color32[]).
Commented out code that opens json file when saved.
2018-02-18 23:28:41 -05:00
Sean Mann b5f8f17203 Improvements on Color Picker:
- .gitignore - Added "/.vs" to ignore VS 2017's new folder.
- Added Color Sampler feature to pick colors from the screen.
- Fixed issue with ColorPickerPresets with "not working" HSVChanged()
- Changed the way ColorPickerPresets work. Can now add predefined colors in the inspector, plus save/load from player prefs or json file.
- Modified UI layout for Picker 2.0 prefab to allow for expansion of presets, toggling of RGB vs HSV. Still could use some work as the layout doesn't collapse/expand nicely.
2018-02-18 23:16:15 -05:00
Simon (Darkside) Jackson 55a7d21860 First pass optimisation for next update.
[x] Cleared any outstanding warnings on build
[x] Tested random scenes and updated (requires further investigation)
2018-01-20 12:08:44 +00:00
Brad Nelson 8f6b2a1888 Fixes to make sure images align correctly and are culled based on the matches for icons in TextPic. 2017-11-07 21:13:24 +00:00
Brad Nelson db2844d8bd Fixed rebuild loop error in TextPic and added disabling/enabling images when the TextPic component is disabled/enabled. 2017-11-06 20:44:20 +00:00
David Gileadi f5602a0e14 Use button colors, improve initial render 2017-09-01 17:39:32 -07:00
David Gileadi 825ae0d504 Move Segment and StepperSide into own files so Unity can find them 2017-08-31 09:29:16 -07:00
David Gileadi ea8a9e9d36 Preserve sprite modifications in more situations 2017-08-19 21:57:27 -07:00
David Gileadi 382a19cb36 Add null (missing component) safety checks 2017-08-12 16:56:22 -07:00
David Gileadi c5edc0cdf1 Change Stepper and Segmented Control to use overrideImage, standard size, other fixes 2017-08-12 16:19:19 -07:00
Simon Jackson c11796ebcc Update 2.0 Check-in 2017-08-11 13:17:10 +01:00
Simon Jackson 688e2edd25 Added the FancyScrollView control and Examples
Reviewed other samples and moved their code to the new "Examples" namespace
Minor fix on HSS/VSS to address issue where Next/Previous buttons didn't enable when new pages added to an empty control
2017-08-02 10:21:45 +01:00
Simon Jackson 6cc0b60cee Small tweak to enable a default lerp if no Lerp Curve supplied
ALso control has a fixed start of 0 (for now)
2017-07-29 21:00:33 +01:00
Simon Jackson fc8bd8ba37 Added Radial Slider menu options
Minor bugix for Radial Slider when no curve assigned
2017-07-29 20:49:04 +01:00
Simon Jackson dd0b3a3cba Added Radial Slider and Example
Still need to add Editor Option for default
2017-07-29 19:09:19 +01:00
Simon Jackson 603d85126f Added Stepper and Segmented Controls to the README.md
Refactored Segmented Control and Stepper to support the more generic "Selectable" interface.
2017-07-26 22:32:48 +01:00
Simon Jackson 8e443b98c7 Updated Stepper and SegmentedControl scripts to UI Extensions standards.
Adding documentation next
2017-07-25 19:54:07 +01:00
Simon Jackson a2bb233141 Merged Stepper control PR #11 2017-07-25 18:54:00 +01:00
David Gileadi 6796238cec Recreate sprites instead of modifying the mesh 2017-07-23 22:43:11 -07:00
David Gileadi 680076b631 Create segmented control 2017-07-23 21:51:23 -07:00