Compare commits
No commits in common. "release" and "2.3.0" have entirely different histories.
|
|
@ -1,10 +1,10 @@
|
|||
name: Build and test UPM packages for platforms, all branches except main
|
||||
name: Build and test UPM packages for platforms on all available Unity Versions
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches-ignore:
|
||||
- 'release'
|
||||
# Ignore PRs targeting main
|
||||
# Ignore PRs targetting main
|
||||
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
|
|
@ -14,7 +14,6 @@ concurrency:
|
|||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
# Check Unity version required by the package
|
||||
# Run Unity build unit tests defined in the package for a single version for feature branches
|
||||
Run-Partial-Unit-Tests:
|
||||
name: Run Unity Unit Tests
|
||||
|
|
@ -28,3 +27,11 @@ jobs:
|
|||
name: Run Unity Unit Tests
|
||||
if: github.ref == 'refs/heads/development'
|
||||
uses: ./.github/workflows/rununitybuildmultiversion.yml
|
||||
|
||||
# Update the package release version
|
||||
Update-Version:
|
||||
name: Update Package Version
|
||||
uses: ./.github/workflows/tagrelease.yml
|
||||
with:
|
||||
build-target: windows
|
||||
secrets: inherit
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
name: Publish development branch on Merge
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- closed
|
||||
branches:
|
||||
- development
|
||||
# On close of PR targeting development
|
||||
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
release_on_merge:
|
||||
if: github.event.pull_request.merged == true
|
||||
name: Tag and Publish UPM package
|
||||
uses: ./.github/workflows/upversionandtagrelease.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
build-type: pre-release
|
||||
secrets: inherit
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
name: Get the Package version from a UPM Package.json file
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
build-host:
|
||||
required: true
|
||||
type: string
|
||||
version-file-path:
|
||||
description: 'Optional, specify a path to search for the upm package.json file. Use this if validation fails to find a valid package.json file.\n **Note, Version file MUST contain the attribute "Unity" with the full Unity version expected, e.g. "2020.2.3f1"'
|
||||
type: string
|
||||
required: false
|
||||
outputs:
|
||||
packageversion:
|
||||
description: "Returns the version of the UPM package"
|
||||
value: ${{ jobs.get_package_version.outputs.upmpackageversion }}
|
||||
|
||||
jobs:
|
||||
get_package_version:
|
||||
name: Get required Package version from UPM Package
|
||||
runs-on: ${{ inputs.build-host }}
|
||||
outputs:
|
||||
upmpackageversion: ${{ steps.getVersion.outputs.packageversion }}
|
||||
steps:
|
||||
- name: Script Version
|
||||
run: |
|
||||
echo "::group::Script Versioning"
|
||||
$scriptVersion = "1.0.0"
|
||||
echo "Build Script Version: $scriptVersion"
|
||||
echo "::endgroup::"
|
||||
shell: pwsh
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: recursive
|
||||
clean: true
|
||||
- id: getVersion
|
||||
name: 'Get Package Version Number'
|
||||
run: |
|
||||
echo "::group::Validating input"
|
||||
|
||||
$versionFile = "${{ inputs.version-file-path }}"
|
||||
if([string]::IsNullOrEmpty($versionFile))
|
||||
{
|
||||
echo 'version input was empty, using default'
|
||||
$versionFile = 'package.json'
|
||||
}
|
||||
echo 'Checking for project json at $versionFile'
|
||||
|
||||
if ( -not (Test-Path -Path $versionFile) ) {
|
||||
Write-Error "Failed to find a valid package.json file"
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::Package Version UPM check"
|
||||
|
||||
$package_json = Get-Content -Path $versionFile | ConvertFrom-Json
|
||||
$packageVersion = $package_json.version
|
||||
|
||||
if([string]::IsNullOrEmpty($packageVersion)) {
|
||||
Write-Error "Project.json version number does not exist or is empty"
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo "packageversion=$packageVersion" >> $env:GITHUB_OUTPUT
|
||||
|
||||
echo "Detected version is $packageVersion"
|
||||
echo "::endgroup::"
|
||||
shell: pwsh
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
name: Publish main branch and increment version
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- closed
|
||||
branches:
|
||||
- release
|
||||
|
||||
jobs:
|
||||
# Get Version to tag and release the branch, no up-version - [no-ver] included in PR title
|
||||
validate-environment:
|
||||
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver')
|
||||
name: Get Version from UPM package
|
||||
uses: ./.github/workflows/getpackageversionfrompackage.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
|
||||
# Perform tagging
|
||||
release-Package-only:
|
||||
needs: validate-environment
|
||||
name: Release package only, no upversion
|
||||
uses: ./.github/workflows/tagrelease.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
version: ${{ needs.validate-environment.outputs.packageversion }}
|
||||
secrets: inherit
|
||||
|
||||
# Up version the release and publish major release
|
||||
upversion-major-Package:
|
||||
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'major-release')
|
||||
name: Major Version package and release
|
||||
uses: ./.github/workflows/upversionandtagrelease.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
build-type: major
|
||||
secrets: inherit
|
||||
|
||||
# Up version the release and publish minor release
|
||||
upversion-minor-Package:
|
||||
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'minor-release')
|
||||
name: Minor Version package and release
|
||||
uses: ./.github/workflows/upversionandtagrelease.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
build-type: minor
|
||||
secrets: inherit
|
||||
|
||||
# Up version the release and publish patch release (default)
|
||||
upversion-patch-Package:
|
||||
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'minor-release') == false && contains(github.event.pull_request.title, 'major-release') == false
|
||||
name: Patch Version package and release
|
||||
uses: ./.github/workflows/upversionandtagrelease.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
build-type: patch-release
|
||||
secrets: inherit
|
||||
|
||||
release-Complete:
|
||||
if: ${{ always() }}
|
||||
needs: [upversion-major-Package, upversion-minor-Package, upversion-patch-Package, release-Package-only]
|
||||
name: Release complete
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Script Version
|
||||
run: echo "Release done, updating Development"
|
||||
|
||||
# Refresh the development branch with the main publish
|
||||
refresh-development:
|
||||
if: ${{ always() }}
|
||||
needs: [release-Complete]
|
||||
name: Refresh development branch
|
||||
uses: ./.github/workflows/refreshbranch.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
target-branch: development
|
||||
source-branch: main
|
||||
secrets: inherit
|
||||
|
||||
# Up version the development branch ready for future development
|
||||
upversion-development:
|
||||
if: ${{ always() }}
|
||||
needs: [refresh-development]
|
||||
name: UpVersion the development branch for the next release
|
||||
uses: ./.github/workflows/upversionandtagrelease.yml
|
||||
with:
|
||||
build-host: ubuntu-latest
|
||||
build-type: patch
|
||||
target-branch: development
|
||||
createTag: false
|
||||
secrets: inherit
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
name: Refresh branch
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
build-host:
|
||||
required: true
|
||||
type: string
|
||||
target-branch:
|
||||
required: true
|
||||
type: string
|
||||
source-branch:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
packageRelease:
|
||||
name: Refresh ${{ inputs.target-branch }} branch from ${{ inputs.source-branch }} branch
|
||||
runs-on: ${{ inputs.build-host }}
|
||||
steps:
|
||||
- name: Script Version
|
||||
run: |
|
||||
echo "::group::Script Versioning"
|
||||
$scriptVersion = "1.0.1"
|
||||
echo "Build Script Version: $scriptVersion"
|
||||
echo "::endgroup::"
|
||||
shell: pwsh
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ inputs.target-branch }}
|
||||
clean: true
|
||||
token: ${{ secrets.GIT_PAT }}
|
||||
- name: Refresh from Source Branch
|
||||
run: |
|
||||
git pull origin ${{ inputs.source-branch }}
|
||||
git commit -m "Branch ${{ inputs.target-branch }} updated with changes from ${{ inputs.source-branch }} [skip ci]"
|
||||
git push origin ${{ inputs.target-branch }}
|
||||
echo "Branch ${{ inputs.target-branch }} updated with changes from ${{ inputs.source-branch }}"
|
||||
shell: pwsh
|
||||
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
- os: windows
|
||||
unityVersion: 2019.4
|
||||
build-target: Android
|
||||
- os: macOS
|
||||
- os: macos
|
||||
unityVersion: 2019.4
|
||||
build-target: iOS
|
||||
- os: windows
|
||||
|
|
@ -30,7 +30,7 @@ jobs:
|
|||
- os: windows
|
||||
unityVersion: 2020.3
|
||||
build-target: Android
|
||||
- os: macOS
|
||||
- os: macos
|
||||
unityVersion: 2020.3
|
||||
build-target: iOS
|
||||
- os: windows
|
||||
|
|
@ -42,7 +42,7 @@ jobs:
|
|||
- os: windows
|
||||
unityVersion: 2021.3
|
||||
build-target: Android
|
||||
- os: macOS
|
||||
- os: macos
|
||||
unityVersion: 2021.3
|
||||
build-target: iOS
|
||||
- os: windows
|
||||
|
|
@ -52,28 +52,16 @@ jobs:
|
|||
unityVersion: 2021.3
|
||||
build-target: WSAPlayer
|
||||
- os: windows
|
||||
unityVersion: 2022.3
|
||||
unityVersion: 2022.2
|
||||
build-target: Android
|
||||
- os: macOS
|
||||
unityVersion: 2022.3
|
||||
- os: macos
|
||||
unityVersion: 2022.2
|
||||
build-target: iOS
|
||||
- os: windows
|
||||
unityVersion: 2022.3
|
||||
unityVersion: 2022.2
|
||||
build-target: StandaloneWindows64
|
||||
- os: windows
|
||||
unityVersion: 2022.3
|
||||
build-target: WSAPlayer
|
||||
- os: windows
|
||||
unityVersion: 2023.1
|
||||
build-target: Android
|
||||
- os: macOS
|
||||
unityVersion: 2023.1
|
||||
build-target: iOS
|
||||
- os: windows
|
||||
unityVersion: 2023.1
|
||||
build-target: StandaloneWindows64
|
||||
- os: windows
|
||||
unityVersion: 2023.1
|
||||
unityVersion: 2022.2
|
||||
build-target: WSAPlayer
|
||||
steps:
|
||||
- name: Script Version
|
||||
|
|
@ -92,7 +80,7 @@ jobs:
|
|||
name: 'Run Unity Builds'
|
||||
run: |
|
||||
echo "::group::Set Hub and editor locations"
|
||||
$unityVersion = '${{ matrix.unityVersion }}'
|
||||
$unityVersion = ${{ matrix.unityVersion }}
|
||||
|
||||
echo "::group::Set Hub and editor locations"
|
||||
|
||||
|
|
@ -102,7 +90,6 @@ jobs:
|
|||
$hubPath = "C:\Program Files\Unity Hub\Unity Hub.exe"
|
||||
$editorRootPath = "C:\Program Files\Unity\Hub\Editor\"
|
||||
$editorFileEx = "\Editor\Unity.exe"
|
||||
$directorySeparatorChar = "\"
|
||||
|
||||
#"Unity Hub.exe" -- --headless help
|
||||
#. 'C:\Program Files\Unity Hub\Unity Hub.exe' -- --headless help
|
||||
|
|
@ -113,12 +100,11 @@ jobs:
|
|||
}
|
||||
elseif ( $global:PSVersionTable.OS.Contains("Darwin") )
|
||||
{
|
||||
$hubPath = "/Applications/Unity Hub.app/Contents/macOS/Unity Hub"
|
||||
$hubPath = "/Applications/Unity Hub.app/Contents/MacOS/Unity Hub"
|
||||
$editorRootPath = "/Applications/Unity/Hub/Editor/"
|
||||
$editorFileEx = "/Unity.app/Contents/macOS/Unity"
|
||||
$directorySeparatorChar = "/"
|
||||
$editorFileEx = "/Unity.app/Contents/MacOS/Unity"
|
||||
|
||||
# /Applications/Unity\ Hub.app/Contents/macOS/Unity\ Hub -- --headless help
|
||||
# /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help
|
||||
function unity-hub
|
||||
{
|
||||
& $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline
|
||||
|
|
@ -129,7 +115,6 @@ jobs:
|
|||
$hubPath = "$HOME/Unity Hub/UnityHub.AppImage"
|
||||
$editorRootPath = "$HOME/Unity/Hub/Editor/"
|
||||
$editorFileEx = "/Editor/Unity"
|
||||
$directorySeparatorChar = "/"
|
||||
|
||||
# /UnityHub.AppImage --headless help
|
||||
# xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help
|
||||
|
|
@ -141,6 +126,8 @@ jobs:
|
|||
|
||||
echo "::endgroup::"
|
||||
|
||||
|
||||
|
||||
echo "::group::Get String function to query a string for a value"
|
||||
|
||||
function GetString($InputString, $InputPattern, $MatchIndex)
|
||||
|
|
@ -164,6 +151,7 @@ jobs:
|
|||
echo "::endgroup::"
|
||||
|
||||
echo "::group::Get Installed Unity version based on Matrix"
|
||||
echo 'Script Start'
|
||||
echo "Unity hub path is {$hubPath}"
|
||||
echo "Requested unity version is {$unityVersion}"
|
||||
|
||||
|
|
@ -183,7 +171,7 @@ jobs:
|
|||
$queryUnityVersion = GetString $InstalledUnityVersions "$unityVersion" -MatchIndex 0
|
||||
}
|
||||
|
||||
echo "Found unity version is {$queryUnityVersion} for input {$unityVersion}"
|
||||
echo "Found unity version is {$queryUnityVersion}"
|
||||
|
||||
if ($queryUnityVersion -ne 0)
|
||||
{
|
||||
|
|
@ -230,7 +218,7 @@ jobs:
|
|||
}
|
||||
elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) {
|
||||
echo 'Building using Mac'
|
||||
$editorFileEx = "/Unity.app/Contents/macOS/Unity"
|
||||
$editorFileEx = "/Unity.app/Contents/MacOS/Unity"
|
||||
$editorrunpath = Join-Path $editorRootPath $unityVersion $editorFileEx
|
||||
|
||||
function unity-editor {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: macOS
|
||||
- os: macos
|
||||
build-target: iOS
|
||||
- os: windows
|
||||
build-target: Android
|
||||
|
|
@ -40,11 +40,12 @@ jobs:
|
|||
with:
|
||||
submodules: recursive
|
||||
clean: true
|
||||
|
||||
- id: build
|
||||
name: 'Run Unity Builds'
|
||||
run: |
|
||||
echo "::group::Set Hub and editor locations"
|
||||
$unityVersion = '${{ inputs.unityVersion }}'
|
||||
$unityVersion = ${{ inputs.unityVersion }}
|
||||
|
||||
echo "::group::Set Hub and editor locations"
|
||||
|
||||
|
|
@ -54,7 +55,6 @@ jobs:
|
|||
$hubPath = "C:\Program Files\Unity Hub\Unity Hub.exe"
|
||||
$editorRootPath = "C:\Program Files\Unity\Hub\Editor\"
|
||||
$editorFileEx = "\Editor\Unity.exe"
|
||||
$directorySeparatorChar = "\"
|
||||
|
||||
#"Unity Hub.exe" -- --headless help
|
||||
#. 'C:\Program Files\Unity Hub\Unity Hub.exe' -- --headless help
|
||||
|
|
@ -68,7 +68,6 @@ jobs:
|
|||
$hubPath = "/Applications/Unity Hub.app/Contents/MacOS/Unity Hub"
|
||||
$editorRootPath = "/Applications/Unity/Hub/Editor/"
|
||||
$editorFileEx = "/Unity.app/Contents/MacOS/Unity"
|
||||
$directorySeparatorChar = "/"
|
||||
|
||||
# /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help
|
||||
function unity-hub
|
||||
|
|
@ -81,7 +80,6 @@ jobs:
|
|||
$hubPath = "$HOME/Unity Hub/UnityHub.AppImage"
|
||||
$editorRootPath = "$HOME/Unity/Hub/Editor/"
|
||||
$editorFileEx = "/Editor/Unity"
|
||||
$directorySeparatorChar = "/"
|
||||
|
||||
# /UnityHub.AppImage --headless help
|
||||
# xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help
|
||||
|
|
@ -93,6 +91,8 @@ jobs:
|
|||
|
||||
echo "::endgroup::"
|
||||
|
||||
|
||||
|
||||
echo "::group::Get String function to query a string for a value"
|
||||
|
||||
function GetString($InputString, $InputPattern, $MatchIndex)
|
||||
|
|
@ -115,7 +115,8 @@ jobs:
|
|||
}
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::Find Installed Unity version based on input"
|
||||
echo "::group::Get Installed Unity version based on Matrix"
|
||||
echo 'Script Start'
|
||||
echo "Unity hub path is {$hubPath}"
|
||||
echo "Requested unity version is {$unityVersion}"
|
||||
|
||||
|
|
@ -135,7 +136,7 @@ jobs:
|
|||
$queryUnityVersion = GetString $InstalledUnityVersions "$unityVersion" -MatchIndex 0
|
||||
}
|
||||
|
||||
echo "Found unity version is {$queryUnityVersion} for input {$unityVersion}"
|
||||
echo "Found unity version is {$queryUnityVersion}"
|
||||
|
||||
if ($queryUnityVersion -ne 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,26 +1,33 @@
|
|||
name: Tag Release
|
||||
name: Package UPM project and deploy
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
build-host:
|
||||
build-target:
|
||||
required: true
|
||||
type: string
|
||||
version:
|
||||
required: true
|
||||
build-type:
|
||||
required: false
|
||||
default: 'pre-release'
|
||||
type: string
|
||||
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
# options:
|
||||
# - major
|
||||
# - minor
|
||||
# - patch
|
||||
# - pre-release
|
||||
# - build
|
||||
outputs:
|
||||
packageversion:
|
||||
description: "Returns the version of Unity the UPM package requires"
|
||||
value: ${{ jobs.packageRelease.outputs.packageversion }}
|
||||
secrets:
|
||||
GIT_USER_NAME:
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
packageRelease:
|
||||
name: Package UPM Project and tag
|
||||
runs-on: ${{ inputs.build-host }}
|
||||
runs-on: ${{ inputs.build-target }}
|
||||
outputs:
|
||||
packageversion: ${{ steps.getpackageversion.outputs.packageversion }}
|
||||
steps:
|
||||
|
|
@ -33,7 +40,6 @@ jobs:
|
|||
shell: pwsh
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
submodules: recursive
|
||||
clean: true
|
||||
token: ${{ secrets.GIT_PAT }}
|
||||
|
|
@ -54,26 +60,87 @@ jobs:
|
|||
$gitUser = "${{ secrets.GIT_USER_NAME }}"
|
||||
$gitEmail = "$gitUser@users.noreply.github.com"
|
||||
}
|
||||
echo "email $gitUser@users.noreply.github.com"
|
||||
git config --global user.email "$gitUser@users.noreply.github.com"
|
||||
git config --global user.name "$gitUser"
|
||||
shell: pwsh
|
||||
- name: Check if Tag Exists
|
||||
- id: getpackageversion
|
||||
name: Bump UPM Package version
|
||||
run: |
|
||||
$tagVersion = "${{ inputs.version }}"
|
||||
$tags = git tag
|
||||
echo "Tags found are [$tags], searching for [$tagVersion]"
|
||||
foreach ($tag in $tags)
|
||||
{
|
||||
if($tag.Trim() -eq "$tagVersion")
|
||||
{
|
||||
Write-Error "$tagVersion tag already exists"
|
||||
exit 1
|
||||
function UpdateProjectVersionJSON {
|
||||
param (
|
||||
[Parameter(Mandatory)]
|
||||
$type,
|
||||
$packageFile = 'package.json'
|
||||
)
|
||||
<#
|
||||
Type of build can be one of the following
|
||||
- 'build' # Build release - 1.0.0-pre-release.0+1
|
||||
- 'pre-release' # Pre-Release release - 1.0.0-pre-release.1
|
||||
- 'patch' # Patch release - 1.0.1
|
||||
- 'minor' # Minor release - 1.1.0
|
||||
- 'major' # Major release - 2.0.0
|
||||
#>
|
||||
|
||||
if ( -not (Test-Path -Path $packageFile) ) {
|
||||
Write-Error "Failed to find a valid project manifest at `"$packageFile`""
|
||||
return $null
|
||||
}
|
||||
|
||||
$packageInfo = (Get-Content $packageFile -Raw) | ConvertFrom-Json
|
||||
Write-Host "Detected Project Version:" $packageInfo.version
|
||||
function IfNull($a, $b, $c) { if ($null -eq $a) { return $b } else { return $c } }
|
||||
|
||||
$packageSemVer = [System.Management.Automation.SemanticVersion]$packageInfo.version
|
||||
$majorVersion = if($null -eq $packageSemVer.Major) {0} else {$packageSemVer.Major}
|
||||
$minorVersion = if($null -eq $packageSemVer.Minor) {0} else {$packageSemVer.Minor}
|
||||
$patchVersion = if($null -eq $packageSemVer.Patch) {0} else {$packageSemVer.Patch}
|
||||
$prereleaseVersion = if($null -eq $packageSemVer.PreReleaseLabel) {0} else {$packageSemVer.PreReleaseLabel.Replace('pre-release.','')}
|
||||
$buildVersion = if($null -eq $packageSemVer.BuildLabel) {0} else {$packageSemVer.BuildLabel}
|
||||
|
||||
# work out new version
|
||||
switch ($type) {
|
||||
'build' {
|
||||
[int]$buildVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion, "pre-release." + $prereleaseVersion, $buildVersion)
|
||||
}
|
||||
'pre-release' {
|
||||
[int]$prereleaseVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion, "pre-release." + $prereleaseVersion)
|
||||
}
|
||||
'patch' {
|
||||
[int]$patchVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion)
|
||||
}
|
||||
'minor' {
|
||||
[int]$minorVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, 0)
|
||||
}
|
||||
'major' {
|
||||
[int]$majorVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, 0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
Write-Host "Upgrading project version [$packageSemVer] to [$newPackageSemVer]"
|
||||
|
||||
# Write out updated package info
|
||||
|
||||
$packageInfo.version = $newPackageSemVer.ToString()
|
||||
$packageInfo | ConvertTo-Json | Set-Content $packageFile
|
||||
|
||||
return $packageInfo.version
|
||||
}
|
||||
shell: pwsh
|
||||
- name: Create tag and push
|
||||
run: |
|
||||
$tagVersion = "${{ inputs.version }}"
|
||||
git tag -fa "v$tagVersion" "${GITHUB_SHA}" -m "v$tagVersion Release [skip ci]"
|
||||
git push origin "v$tagVersion" --force
|
||||
|
||||
$packageFile = 'package.json'
|
||||
$result = UpdateProjectVersionJSON("${{ inputs.build-type }}","$packageFile")
|
||||
if([string]::IsNullOrEmpty($result)) {
|
||||
echo "Version patch failed"
|
||||
exit 1
|
||||
}
|
||||
echo "packageversion=$result" >> $env:GITHUB_OUTPUT
|
||||
git add "$packageFile"
|
||||
git commit -m "Auto increment pre-release version to $result [skip ci]"
|
||||
git tag -fa "$result" "${GITHUB_SHA}" -m "$result Release"
|
||||
git push origin --force
|
||||
shell: pwsh
|
||||
|
|
@ -1,181 +0,0 @@
|
|||
name: UpVersion Package UPM project and create new tag
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
build-host:
|
||||
required: true
|
||||
type: string
|
||||
build-type:
|
||||
required: false
|
||||
default: 'pre-release'
|
||||
type: string
|
||||
# options:
|
||||
# - major
|
||||
# - minor
|
||||
# - patch
|
||||
# - patch-release
|
||||
# - pre-release
|
||||
# - build
|
||||
target-branch:
|
||||
required: false
|
||||
type: string
|
||||
default: ${{ github.ref }}
|
||||
createTag:
|
||||
required: false
|
||||
type: boolean
|
||||
default: true
|
||||
|
||||
outputs:
|
||||
packageversion:
|
||||
description: "Returns the version of Unity the UPM package requires"
|
||||
value: ${{ jobs.packageRelease.outputs.packageversion }}
|
||||
secrets:
|
||||
GIT_PAT:
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
packageRelease:
|
||||
name: Package UPM Project and tag
|
||||
runs-on: ${{ inputs.build-host }}
|
||||
outputs:
|
||||
packageversion: ${{ steps.getpackageversion.outputs.packageversion }}
|
||||
steps:
|
||||
- name: Script Version
|
||||
run: |
|
||||
echo "::group::Script Versioning"
|
||||
$scriptVersion = "1.0.2"
|
||||
echo "Build Script Version: $scriptVersion"
|
||||
echo "::endgroup::"
|
||||
shell: pwsh
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ inputs.target-branch }}
|
||||
fetch-depth: 0
|
||||
submodules: recursive
|
||||
clean: true
|
||||
token: ${{ secrets.GIT_PAT }}
|
||||
- uses: actions/setup-node@v3
|
||||
- name: Set Github vars
|
||||
run: |
|
||||
if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}')){
|
||||
if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}')){
|
||||
$gitUser = "action"
|
||||
$gitEmail = "action@github.com"
|
||||
}
|
||||
else {
|
||||
$gitUser = "${GITHUB_ACTOR}"
|
||||
$gitEmail = "$gitUser@users.noreply.github.com"
|
||||
}
|
||||
}
|
||||
else {
|
||||
$gitUser = "${{ secrets.GIT_USER_NAME }}"
|
||||
$gitEmail = "$gitUser@users.noreply.github.com"
|
||||
}
|
||||
git config --global user.email "$gitUser@users.noreply.github.com"
|
||||
git config --global user.name "$gitUser"
|
||||
shell: pwsh
|
||||
- id: getpackageversion
|
||||
name: Bump UPM Package version
|
||||
run: |
|
||||
function UpdateProjectVersionJSON {
|
||||
param (
|
||||
[Parameter(Mandatory)]
|
||||
$type,
|
||||
$packageFile = 'package.json'
|
||||
)
|
||||
<#
|
||||
Type of build can be one of the following
|
||||
- 'build' # Build release - 1.0.0-pre.0+1
|
||||
- 'pre-release' # Pre-Release - 1.0.0-pre.1
|
||||
- 'patch-release' # Patch release - 1.0.1 (reset preview version to current patch, no increase)
|
||||
- 'patch' # Patch release - 1.0.1
|
||||
- 'minor' # Minor release - 1.1.0
|
||||
- 'major' # Major release - 2.0.0
|
||||
#>
|
||||
|
||||
if ( -not (Test-Path -Path $packageFile) ) {
|
||||
Write-Error "Failed to find a valid project manifest at `"$packageFile`""
|
||||
return $null
|
||||
}
|
||||
|
||||
$packageInfo = (Get-Content $packageFile -Raw) | ConvertFrom-Json
|
||||
Write-Host "Detected Project Version:" $packageInfo.version
|
||||
function IfNull($a, $b, $c) { if ($null -eq $a) { return $b } else { return $c } }
|
||||
|
||||
$packageSemVer = [System.Management.Automation.SemanticVersion]$packageInfo.version
|
||||
$majorVersion = if($null -eq $packageSemVer.Major) {0} else {$packageSemVer.Major}
|
||||
$minorVersion = if($null -eq $packageSemVer.Minor) {0} else {$packageSemVer.Minor}
|
||||
$patchVersion = if($null -eq $packageSemVer.Patch) {0} else {$packageSemVer.Patch}
|
||||
$prereleaseVersion = if($null -eq $packageSemVer.PreReleaseLabel) {0} else {$packageSemVer.PreReleaseLabel.Replace('pre.','')}
|
||||
$buildVersion = if($null -eq $packageSemVer.BuildLabel) {0} else {$packageSemVer.BuildLabel}
|
||||
|
||||
# work out new version
|
||||
switch ($type) {
|
||||
'build' {
|
||||
[int]$buildVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion, "pre." + $prereleaseVersion, $buildVersion)
|
||||
}
|
||||
'pre-release' {
|
||||
[int]$prereleaseVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion, "pre." + $prereleaseVersion)
|
||||
}
|
||||
'patch-release' {
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion)
|
||||
}
|
||||
'patch' {
|
||||
[int]$patchVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, $patchVersion)
|
||||
}
|
||||
'minor' {
|
||||
[int]$minorVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, $minorVersion, 0)
|
||||
}
|
||||
'major' {
|
||||
[int]$majorVersion += 1
|
||||
$newPackageSemVer = [System.Management.Automation.SemanticVersion]::New($majorVersion, 0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
Write-Host "Upgrading project version [$packageSemVer] to [$newPackageSemVer]"
|
||||
|
||||
# Write out updated package info
|
||||
|
||||
$packageInfo.version = $newPackageSemVer.ToString()
|
||||
$packageInfo | ConvertTo-Json | Set-Content $packageFile
|
||||
|
||||
return $packageInfo.version
|
||||
}
|
||||
|
||||
$packageFile = 'package.json'
|
||||
$result = UpdateProjectVersionJSON("${{ inputs.build-type }}","$packageFile")
|
||||
if([string]::IsNullOrEmpty($result)) {
|
||||
echo "Version patch failed"
|
||||
exit 1
|
||||
}
|
||||
git add "$packageFile"
|
||||
git commit -m "Auto increment pre-release version to $result [skip ci]"
|
||||
git push origin
|
||||
echo "packageversion=$result" >> $env:GITHUB_OUTPUT
|
||||
shell: pwsh
|
||||
- name: Check if Tag Exists
|
||||
run: |
|
||||
$tagVersion = '${{steps.getpackageversion.outputs.packageversion }}'
|
||||
$tags = git tag
|
||||
echo "Tags found are [$tags], searching for [$tagVersion]"
|
||||
foreach ($tag in $tags)
|
||||
{
|
||||
if($tag.Trim() -eq "$tagVersion")
|
||||
{
|
||||
Write-Error "$tagVersion tag already exists"
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
shell: pwsh
|
||||
- name: Publish package tag
|
||||
if: ${{inputs.createTag == true}}
|
||||
run: |
|
||||
$outputVersion = '${{steps.getpackageversion.outputs.packageversion }}'
|
||||
git tag -fa "v$outputVersion" "${GITHUB_SHA}" -m "v$outputVersion Release"
|
||||
git push origin "v$outputVersion" --force --tags
|
||||
shell: pwsh
|
||||
|
|
@ -33,5 +33,3 @@ sysinfo.txt
|
|||
*.apk
|
||||
*.unitypackage
|
||||
/.vs
|
||||
|
||||
**/node_modules/*
|
||||
73
CHANGELOG.md
73
CHANGELOG.md
|
|
@ -4,18 +4,17 @@ All notable changes to this project will be documented in this file.
|
|||
|
||||
The format is based on [Keep a Changelog](http://keepachangelog.com/).
|
||||
|
||||
## Release 2.3.2 - Rejuvenation - 2023/11/26
|
||||
## Release 2.3 - Reanimation - 2022/02/07
|
||||
|
||||
2023 is certainly an interesting year to keep you on your toes, and finding time to keep managing all the requests and updates that come in are taking their toll, especially for a FREE project, but nonetheless, I still do it.
|
||||
|
||||
Mainly bugfixes for the end of year update, promoting some resolutions that have been verified and tested since the last release.
|
||||
It has been a tough time for all since the last update, but things have been moving steadily along. In the past few months there has been a concerted effort to revamp and update the project ready for Unity 2022, as well as migrating the source repository over to GitHub and refreshing all the things.
|
||||
We hope the new release is better for everyone and we have paid close attention to the editor menus and places to find all the controls for this release.
|
||||
|
||||
To get up to speed with the Unity UI Extensions, check out the [Getting Started](https://unity-ui-extensions.github.io/GettingStarted.html) Page.
|
||||
|
||||
> Ways to get in touch:
|
||||
>
|
||||
> - [GitHub Discussions](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/discussions), if you have any questions, queries or suggestions
|
||||
> - [Gitter Chat](https://gitter.im/Unity-UI-Extensions/Lobby) site for the UI Extensions project
|
||||
> - [GitHub Discussions](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/discussions), if you have any questions, queries or suggestions
|
||||
>
|
||||
> Much easier that posting a question / issue on YouTube, Twitter or Facebook :D
|
||||
|
||||
|
|
@ -29,23 +28,64 @@ For more details, see the [deprecation notice](https://github.com/Unity-UI-Exten
|
|||
|
||||
## Added
|
||||
|
||||
- Add CalculatePointOnCurve for uilinerenderer (@victornor)
|
||||
- Added new FIFO based UI Line Render when dynamic line rendering is needed.
|
||||
- Added ResetSelectableHighlight component.
|
||||
- Added SetArc method to UICircle as requested.
|
||||
- Added new UIHorizontalScroller based on UIVerticalScroller.
|
||||
- Added OnHighlightChanged and OnPressChanged events for UI Button.
|
||||
- Added error handling around setting Unity UI Components for Vertical/Horizontal ScrollSnaps.
|
||||
- Added Editor Menu Option to create a Min/Max slider.
|
||||
- Added the ability to set a specific item for combobox controls on start and not just the first.
|
||||
- Added the ability to disable the combo boxes and make them read-only.
|
||||
|
||||
## Changed
|
||||
|
||||
- fix: Fixed an null reference exception with the ResetSelectableHighlight (@FejZa)
|
||||
- fix: Resolved an issue where the last line in a flow layout group would overflow the rect bounds.
|
||||
- fix: GetPosition when Segments is null (@victornor)
|
||||
- fix: Fix Bug! NicerOutline color.a Loss when m_UseGraphicAlpha is true (wanliyun)
|
||||
- fix: Update to force Enumerated start for Accordion elements, Resolves: #455
|
||||
- Added argument to the UpdateLayout method for the HSS/VSS to move to a new starting page.
|
||||
- Updated implementations to handle 2023 support, with 2023 moving in to public release.
|
||||
- Added extra event on the AutoCompleteComboBox, to fire when an item in the list is selected, with its display name.
|
||||
- FlowLayoutGroup components updated to latest (likely the last as the author has stopped development)
|
||||
- Refresh FancyScrollView with the latest fixes
|
||||
- All Text based components updated to use TextMeshPro from Unity 2022 **Breaking Change**
|
||||
|
||||
- Clean-up and reset pivots on scene start.
|
||||
- Merged in feature/improved-ui-highlightable (pull request UILineRenderer - issues with specifying point locations at runtime #123).
|
||||
- Merged in fix/rangesliderfix (pull request HorizontalScrollSnap Mask Area doesn't work when content created dynamically #125).
|
||||
- Merged in fix/infinitescrollcontentsize (pull request Gradient initialization should be in Awake() #126).
|
||||
- Merged in feature/controlTouchUp (pull request UILineRenderer mesh not updating in Editor scene view #127).
|
||||
- Upgraded RangeSlider to work in both Horizontal and Vertical setups.
|
||||
- Merged in RangeSlider-upgrade. (pull request Newtonsoft.Json.dll conflict #131)
|
||||
- Updated UIVertical scroller to be 2022 compliant.
|
||||
- Updated Curly UI to wait until end of the frame to recalculate positions.
|
||||
- Updated Depth Texture sampler in UI Particles Shaders.
|
||||
- Updated Points to always be an array of 1 when set to nothing for the Line Renderer.
|
||||
- Updated Cooldown button to work with Keyboard input.
|
||||
- Removed unneeded size calculation which caused some issues with mixed content.
|
||||
- Resolved an issue whereby the last row in a flow layout group would not size correctly.
|
||||
- Updated all components using "LayoutGroup" to override their OnDisable.
|
||||
- Updated validation in the new MinMaxSlider.
|
||||
- Updated Editor create options to add the correct Event System Input manager.
|
||||
- Updated initialisation logic to not cause an endless loop in the TabNavigationHelper.
|
||||
- Updated "Action" use to "UnityAction" to avoid Unity issues for DropDowns.
|
||||
- Updated UIVerticalScroller for standards.
|
||||
- Updated ReorderableList/ReorderableListElement to prevent creating a fake object for non-transferable items.
|
||||
- Updated panel drawing for ComboBox controls and added DropdownOffset.
|
||||
- Updated build issue with ReorderableListElement.
|
||||
- Updated NonDrawingGraphic to require a CanvasRender, else it causes an error on run.
|
||||
|
||||
## Deprecated
|
||||
|
||||
- All deprecated Text based components now have "obsolete" tags, to avoid breaking code. Note, these do not function in 2022 and above, as Unity have "changed" things. For any affected component, I recommend updating to use TextMeshPro native features.
|
||||
- Marked ScrollPositionController as Obsolete, users should use the new Scoller.
|
||||
- BestFitOutline - Deprecated in Unity 2020 onwards. (still available for earlier versions)
|
||||
- NicerOutline - Deprecated in Unity 2020 onwards. (still available for earlier versions)
|
||||
- Marked TileSizeFitter as obsolete as Unity has made this unworkable.
|
||||
|
||||
## Fixed
|
||||
|
||||
- Resolved issues with DisplayAbove and using a 0 ItemsToDisplay for ComboBox controls.
|
||||
- Resolved startup issue that prevented the control from being used (Unity changed the start order in some instances), this was causing null reference issues with comboboxes.
|
||||
- Patch fix for UILineRenderer.
|
||||
- Resolves issue where the lower range value would become stuck when moving.
|
||||
- Updated Infinite scroll to work with content of different sizes.
|
||||
- Updated Dropdown list to NOT resize text Rect on draw.
|
||||
- Revised the Curly UI fix as it was preventing the graphic from being updated in the scene view.
|
||||
- Cleanup and ensuring the UIParticleSystem is disposed in onDestroy correctly.
|
||||
- Clean up range slider unused variables.
|
||||
|
||||
## Additional Notes
|
||||
|
||||
|
|
@ -58,7 +98,6 @@ New for 2020, we have added OpenUPM support and the package can be installed usi
|
|||
```cli
|
||||
`openupm add com.unity.uiextensions`
|
||||
```
|
||||
|
||||
> For more details on using [OpenUPM CLI, check the docs here](https://github.com/openupm/openupm-cli#installation).
|
||||
|
||||
- Unity Package Manager - manual
|
||||
|
|
|
|||
|
|
@ -42,18 +42,17 @@ This version of the Unity UI Extensions is compatible with the following version
|
|||
|
||||
## [Release Notes](https://unity-ui-extensions.github.io/ReleaseNotes/RELEASENOTES)
|
||||
|
||||
## Release 2.3.2 - Rejuvenation - 2023/11/26
|
||||
## Release 2.3 - Reanimation - 2022/02/07
|
||||
|
||||
2023 is certainly an interesting year to keep you on your toes, and finding time to keep managing all the requests and updates that come in are taking their toll, especially for a FREE project, but nonetheless, I still do it.
|
||||
|
||||
Mainly bugfixes for the end of year update, promoting some resolutions that have been verified and tested since the last release.
|
||||
It has been a tough time for all since the last update, but things have been moving steadily along. In the past few months there has been a concerted effort to revamp and update the project ready for Unity 2022, as well as migrating the source repository over to GitHub and refreshing all the things.
|
||||
We hope the new release is better for everyone and we have paid close attention to the editor menus and places to find all the controls for this release.
|
||||
|
||||
To get up to speed with the Unity UI Extensions, check out the [Getting Started](https://unity-ui-extensions.github.io/GettingStarted.html) Page.
|
||||
|
||||
> Ways to get in touch:
|
||||
>
|
||||
> - [GitHub Discussions](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/discussions), if you have any questions, queries or suggestions
|
||||
> - [Gitter Chat](https://gitter.im/Unity-UI-Extensions/Lobby) site for the UI Extensions project
|
||||
> - [GitHub Discussions](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/discussions), if you have any questions, queries or suggestions
|
||||
>
|
||||
> Much easier that posting a question / issue on YouTube, Twitter or Facebook :D
|
||||
|
||||
|
|
@ -67,23 +66,64 @@ For more details, see the [deprecation notice](https://github.com/Unity-UI-Exten
|
|||
|
||||
## Added
|
||||
|
||||
- Add CalculatePointOnCurve for uilinerenderer (@victornor)
|
||||
- Added new FIFO based UI Line Render when dynamic line rendering is needed.
|
||||
- Added ResetSelectableHighlight component.
|
||||
- Added SetArc method to UICircle as requested.
|
||||
- Added new UIHorizontalScroller based on UIVerticalScroller.
|
||||
- Added OnHighlightChanged and OnPressChanged events for UI Button.
|
||||
- Added error handling around setting Unity UI Components for Vertical/Horizontal ScrollSnaps.
|
||||
- Added Editor Menu Option to create a Min/Max slider.
|
||||
- Added the ability to set a specific item for combobox controls on start and not just the first.
|
||||
- Added the ability to disable the combo boxes and make them read-only.
|
||||
|
||||
## Changed
|
||||
|
||||
- fix: Fixed an null reference exception with the ResetSelectableHighlight (@FejZa)
|
||||
- fix: Resolved an issue where the last line in a flow layout group would overflow the rect bounds.
|
||||
- fix: GetPosition when Segments is null (@victornor)
|
||||
- fix: Fix Bug! NicerOutline color.a Loss when m_UseGraphicAlpha is true (wanliyun)
|
||||
- fix: Update to force Enumerated start for Accordion elements, Resolves: #455
|
||||
- Added argument to the UpdateLayout method for the HSS/VSS to move to a new starting page.
|
||||
- Updated implementations to handle 2023 support, with 2023 moving in to public release.
|
||||
- Added extra event on the AutoCompleteComboBox, to fire when an item in the list is selected, with its display name.
|
||||
- FlowLayoutGroup components updated to latest (likely the last as the author has stopped development)
|
||||
- Refresh FancyScrollView with the latest fixes
|
||||
- All Text based components updated to use TextMeshPro from Unity 2022 **Breaking Change**
|
||||
|
||||
- Clean-up and reset pivots on scene start.
|
||||
- Merged in feature/improved-ui-highlightable (pull request UILineRenderer - issues with specifying point locations at runtime #123).
|
||||
- Merged in fix/ragesliderfix (pull request HorizontalScrollSnap Mask Area doesn't work when content created dynamically #125).
|
||||
- Merged in fix/infinitescrollcontentsize (pull request Gradient initialization should be in Awake() #126).
|
||||
- Merged in feature/controlTouchUp (pull request UILineRenderer mesh not updating in Editor scene view #127).
|
||||
- Upgraded RangeSlider to work in both Horizontal and Vertical setups.
|
||||
- Merged in RangeSlider-upgrade. (pull request Newtonsoft.Json.dll conflict #131)
|
||||
- Updated UIVertical scroller to be 2022 compliant.
|
||||
- Updated Curly UI to wait until end of the frame to recalculate positions.
|
||||
- Updated Depth Texture sampler in UI Particles Shaders.
|
||||
- Updated Points to always be an array of 1 when set to nothing for the Line Renderer.
|
||||
- Updated Cooldown button to work with Keyboard input.
|
||||
- Removed unneeded size calculation which caused some issues with mixed content.
|
||||
- Resolved an issue whereby the last row in a flow layout group would not size correctly.
|
||||
- Updated all components using "LayoutGroup" to override their OnDisable.
|
||||
- Updated validation in the new MinMaxSlider.
|
||||
- Updated Editor create options to add the correct Event System Input manager.
|
||||
- Updated initialisation logic to not cause an endless loop in the TabNavigationHelper.
|
||||
- Updated "Action" use to "UnityAction" to avoid Unity issues for DropDowns.
|
||||
- Updated UIVerticalScroller for standards.
|
||||
- Updated ReorderableList/ReorderableListElement to prevent creating a fake object for non-transferable items.
|
||||
- Updated panel drawing for ComboBox controls and added DropdownOffset.
|
||||
- Updated build issue with ReorderableListElement.
|
||||
- Updated NonDrawingGraphic to require a CanvasRender, else it causes an error on run.
|
||||
|
||||
## Deprecated
|
||||
|
||||
- All deprecated Text based components now have "obsolete" tags, to avoid breaking code. Note, these do not function in 2022 and above, as Unity have "changed" things. For any affected component, I recommend updating to use TextMeshPro native features.
|
||||
- Marked ScrollPositionController as Obsolete, users should use the new Scoller.
|
||||
- BestFitOutline - Deprecated in Unity 2020 onwards. (still available for earlier versions)
|
||||
- NicerOutline - Deprecated in Unity 2020 onwards. (still available for earlier versions)
|
||||
- Marked TileSizeFitter as obsolete as Unity has made this unworkable.
|
||||
|
||||
## Fixed
|
||||
|
||||
- Resolved issues with DisplayAbove and using a 0 ItemsToDisplay for ComboBox controls.
|
||||
- Resolved startup issue that prevented the control from being used (Unity changed the start order in some instances), this was causing null reference issues with comboboxes.
|
||||
- Patch fix for UILineRenderer.
|
||||
- Resolves issue where the lower range value would become stuck when moving.
|
||||
- Updated Infinite scroll to work with content of different sizes.
|
||||
- Updated Dropdown list to NOT resize text Rect on draw.
|
||||
- Revised the Curly UI fix as it was preventing the graphic from being updated in the scene view.
|
||||
- Cleanup and ensuring the UIParticleSystem is disposed in onDestroy correctly.
|
||||
- Clean up range slider unused variables.
|
||||
|
||||
- [UI Extensions Issue log](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/issues)
|
||||
|
||||
|
|
|
|||
|
|
@ -29,11 +29,7 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
void ObtainCanvasGroups()
|
||||
{
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
canvasGroups = GameObject.FindObjectsByType<CanvasGroup>(FindObjectsSortMode.None);
|
||||
#else
|
||||
canvasGroups = GameObject.FindObjectsOfType<CanvasGroup>();
|
||||
#endif
|
||||
}
|
||||
|
||||
void OnGUI()
|
||||
|
|
|
|||
|
|
@ -159,11 +159,7 @@ namespace UnityEditor.UI
|
|||
|
||||
private static void CreateEventSystem(bool select, GameObject parent)
|
||||
{
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
var esys = Object.FindFirstObjectByType<EventSystem>();
|
||||
#else
|
||||
var esys = Object.FindObjectOfType<EventSystem>();
|
||||
#endif
|
||||
if (esys == null)
|
||||
{
|
||||
var eventSystem = new GameObject("EventSystem");
|
||||
|
|
@ -195,11 +191,7 @@ namespace UnityEditor.UI
|
|||
return canvas.gameObject;
|
||||
|
||||
// No canvas in selection or its parents? Then use just any canvas..
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
canvas = Object.FindFirstObjectByType<Canvas>();
|
||||
#else
|
||||
canvas = Object.FindObjectOfType(typeof(Canvas)) as Canvas;
|
||||
#endif
|
||||
if (canvas != null && canvas.gameObject.activeInHierarchy)
|
||||
return canvas.gameObject;
|
||||
|
||||
|
|
@ -1129,7 +1121,7 @@ namespace UnityEditor.UI
|
|||
mainButtonRT.anchorMin = Vector2.zero;
|
||||
mainButtonRT.anchorMax = Vector2.one;
|
||||
mainButtonRT.sizeDelta = Vector2.zero;
|
||||
Events.UnityEventTools.AddPersistentListener(mainButton.GetComponent<Button>().onClick, dropDownList.ToggleDropdownPanel);
|
||||
Events.UnityEventTools.AddBoolPersistentListener(mainButton.GetComponent<Button>().onClick, new UnityEngine.Events.UnityAction<bool>(dropDownList.ToggleDropdownPanel), true);
|
||||
var mainButtonText = mainButton.GetComponentInChildren<Text>();
|
||||
mainButtonText.alignment = TextAnchor.MiddleLeft;
|
||||
mainButtonText.text = "Select Item...";
|
||||
|
|
@ -1157,7 +1149,7 @@ namespace UnityEditor.UI
|
|||
overlayRT.sizeDelta = new Vector2(0f, 1f);
|
||||
overlayRT.pivot = new Vector2(0f, 1f);
|
||||
overlay.AddComponent<Image>().color = new Color(0.243f, 0.871f, 0f, 0f);
|
||||
Events.UnityEventTools.AddPersistentListener(overlay.AddComponent<Button>().onClick, dropDownList.ToggleDropdownPanel);
|
||||
Events.UnityEventTools.AddBoolPersistentListener(overlay.AddComponent<Button>().onClick, new UnityEngine.Events.UnityAction<bool>(dropDownList.ToggleDropdownPanel), true);
|
||||
//Overlay Scroll Panel
|
||||
var overlayScrollPanelRT = overlayScrollPanel.GetComponent<RectTransform>();
|
||||
overlayScrollPanelRT.position += new Vector3(0, -cbbRT.sizeDelta.y, 0);
|
||||
|
|
@ -1265,11 +1257,7 @@ namespace UnityEditor.UI
|
|||
|
||||
private static void CreateToolTipItem(bool select, GameObject parent)
|
||||
{
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
var btti = Object.FindFirstObjectByType<BoundTooltipItem>();
|
||||
#else
|
||||
var btti = Object.FindObjectOfType<BoundTooltipItem>();
|
||||
#endif
|
||||
if (btti == null)
|
||||
{
|
||||
var boundTooltipItem = CreateUIObject("ToolTipItem", parent.GetComponentInParent<Canvas>().gameObject);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
public static class uGUITools
|
||||
{
|
||||
[MenuItem("Tools/UnityUIExtensions/Anchors to Corners %[")]
|
||||
[MenuItem("uGUI/Anchors to Corners %[")]
|
||||
static void AnchorsToCorners()
|
||||
{
|
||||
if (Selection.transforms == null || Selection.transforms.Length == 0)
|
||||
|
|
@ -37,7 +37,7 @@ namespace UnityEngine.UI.Extensions
|
|||
Undo.CollapseUndoOperations(undoGroup);
|
||||
}
|
||||
|
||||
[MenuItem("Tools/UnityUIExtensions/Corners to Anchors %]")]
|
||||
[MenuItem("uGUI/Corners to Anchors %]")]
|
||||
static void CornersToAnchors()
|
||||
{
|
||||
if (Selection.transforms == null || Selection.transforms.Length == 0)
|
||||
|
|
@ -60,13 +60,13 @@ namespace UnityEngine.UI.Extensions
|
|||
Undo.CollapseUndoOperations(undoGroup);
|
||||
}
|
||||
|
||||
[MenuItem("Tools/UnityUIExtensions/Mirror Horizontally Around Anchors %;")]
|
||||
[MenuItem("uGUI/Mirror Horizontally Around Anchors %;")]
|
||||
static void MirrorHorizontallyAnchors()
|
||||
{
|
||||
MirrorHorizontally(false);
|
||||
}
|
||||
|
||||
[MenuItem("Tools/UnityUIExtensions/Mirror Horizontally Around Parent Center %:")]
|
||||
[MenuItem("uGUI/Mirror Horizontally Around Parent Center %:")]
|
||||
static void MirrorHorizontallyParent()
|
||||
{
|
||||
MirrorHorizontally(true);
|
||||
|
|
@ -96,13 +96,13 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
|
||||
[MenuItem("Tools/UnityUIExtensions/Mirror Vertically Around Anchors %'")]
|
||||
[MenuItem("uGUI/Mirror Vertically Around Anchors %'")]
|
||||
static void MirrorVerticallyAnchors()
|
||||
{
|
||||
MirrorVertically(false);
|
||||
}
|
||||
|
||||
[MenuItem("Tools/UnityUIExtensions/Mirror Vertically Around Parent Center %\"")]
|
||||
[MenuItem("uGUI/Mirror Vertically Around Parent Center %\"")]
|
||||
static void MirrorVerticallyParent()
|
||||
{
|
||||
MirrorVertically(true);
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 1cfaa42b3fcc454950009cc03a8280fd18e38197
|
||||
Subproject commit 2b2dba57650838e285c3336b4a26847931462570
|
||||
91
README.md
91
README.md
|
|
@ -4,11 +4,6 @@ This is an extension project for the new Unity UI system which can be found at:
|
|||
|
||||
> [Check out the control demos on our Tumblr page](https://unityuiextensions.tumblr.com/)
|
||||
|
||||
[](https://openupm.com/packages/com.unity.uiextensions/)
|
||||
[](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/actions/workflows/main-publish.yml)
|
||||
[](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/actions/workflows/development-publish.yml)
|
||||
[](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/actions/workflows/development-buildandtestupmrelease.yml)
|
||||
|
||||
## [Intro](https://unity-ui-extensions.github.io/GettingStarted)
|
||||
|
||||
For more info, here's a little introduction video for the project:
|
||||
|
|
@ -34,7 +29,7 @@ In this repository is a collection of extension scripts / effects and controls t
|
|||
|
||||
You can either download / fork this project to access the scripts, or you can also download these pre-compiled Unity Assets, chock full of goodness for each release:
|
||||
|
||||
## [Download Latest - Version 2.3](https://unity-ui-extensions.github.io/Downloads)
|
||||
## [Download - 2019.6 (aka 2.5)](https://unity-ui-extensions.github.io/Downloads)
|
||||
|
||||
We have expanded where you can download the UnityPackage asset and widened the options to contribute to the project.
|
||||
|
||||
|
|
@ -74,18 +69,17 @@ To get started with the project, here's a little guide:
|
|||
|
||||
## [Updates:](https://unity-ui-extensions.github.io/ReleaseNotes/RELEASENOTES)
|
||||
|
||||
## Release 2.3.2 - Rejuvenation - 2023/11/26
|
||||
## Release 2.3 - Reanimation - 2022/02/07
|
||||
|
||||
2023 is certainly an interesting year to keep you on your toes, and finding time to keep managing all the requests and updates that come in are taking their toll, especially for a FREE project, but nonetheless, I still do it.
|
||||
|
||||
Mainly bugfixes for the end of year update, promoting some resolutions that have been verified and tested since the last release.
|
||||
It has been a tough time for all since the last update, but things have been moving steadily along. In the past few months there has been a concerted effort to revamp and update the project ready for Unity 2022, as well as migrating the source repository over to GitHub and refreshing all the things.
|
||||
We hope the new release is better for everyone and we have paid close attention to the editor menus and places to find all the controls for this release.
|
||||
|
||||
To get up to speed with the Unity UI Extensions, check out the [Getting Started](https://unity-ui-extensions.github.io/GettingStarted.html) Page.
|
||||
|
||||
> Ways to get in touch:
|
||||
>
|
||||
> - [GitHub Discussions](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/discussions), if you have any questions, queries or suggestions
|
||||
> - [Gitter Chat](https://gitter.im/Unity-UI-Extensions/Lobby) site for the UI Extensions project
|
||||
> - [GitHub Discussions](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/discussions), if you have any questions, queries or suggestions
|
||||
>
|
||||
> Much easier that posting a question / issue on YouTube, Twitter or Facebook :D
|
||||
|
||||
|
|
@ -99,25 +93,66 @@ For more details, see the [deprecation notice](https://github.com/Unity-UI-Exten
|
|||
|
||||
## Added
|
||||
|
||||
- Add CalculatePointOnCurve for uilinerenderer (@victornor)
|
||||
- Added new FIFO based UI Line Render when dynamic line rendering is needed.
|
||||
- Added ResetSelectableHighlight component.
|
||||
- Added SetArc method to UICircle as requested.
|
||||
- Added new UIHorizontalScroller based on UIVerticalScroller.
|
||||
- Added OnHighlightChanged and OnPressChanged events for UI Button.
|
||||
- Added error handling around setting Unity UI Components for Vertical/Horizontal ScrollSnaps.
|
||||
- Added Editor Menu Option to create a Min/Max slider.
|
||||
- Added the ability to set a specific item for combobox controls on start and not just the first.
|
||||
- Added the ability to disable the combo boxes and make them read-only.
|
||||
|
||||
## Changed
|
||||
|
||||
- fix: Fixed an null reference exception with the ResetSelectableHighlight (@FejZa)
|
||||
- fix: Resolved an issue where the last line in a flow layout group would overflow the rect bounds.
|
||||
- fix: GetPosition when Segments is null (@victornor)
|
||||
- fix: Fix Bug! NicerOutline color.a Loss when m_UseGraphicAlpha is true (wanliyun)
|
||||
- fix: Update to force Enumerated start for Accordion elements, Resolves: #455
|
||||
- Added argument to the UpdateLayout method for the HSS/VSS to move to a new starting page.
|
||||
- Updated implementations to handle 2023 support, with 2023 moving in to public release.
|
||||
- Added extra event on the AutoCompleteComboBox, to fire when an item in the list is selected, with its display name.
|
||||
- FlowLayoutGroup components updated to latest (likely the last as the author has stopped development)
|
||||
- Refresh FancyScrollView with the latest fixes
|
||||
- All Text based components updated to use TextMeshPro from Unity 2022 **Breaking Change**
|
||||
|
||||
- Clean-up and reset pivots on scene start.
|
||||
- Merged in feature/improved-ui-highlightable (pull request UILineRenderer - issues with specifying point locations at runtime #123).
|
||||
- Merged in fix/ragesliderfix (pull request HorizontalScrollSnap Mask Area doesn't work when content created dynamically #125).
|
||||
- Merged in fix/infinitescrollcontentsize (pull request Gradient initialization should be in Awake() #126).
|
||||
- Merged in feature/controlTouchUp (pull request UILineRenderer mesh not updating in Editor scene view #127).
|
||||
- Upgraded RangeSlider to work in both Horizontal and Vertical setups.
|
||||
- Merged in RangeSlider-upgrade. (pull request Newtonsoft.Json.dll conflict #131)
|
||||
- Updated UIVertical scroller to be 2022 compliant.
|
||||
- Updated Curly UI to wait until end of the frame to recalculate positions.
|
||||
- Updated Depth Texture sampler in UI Particles Shaders.
|
||||
- Updated Points to always be an array of 1 when set to nothing for the Line Renderer.
|
||||
- Updated Cooldown button to work with Keyboard input.
|
||||
- Removed unneeded size calculation which caused some issues with mixed content.
|
||||
- Resolved an issue whereby the last row in a flow layout group would not size correctly.
|
||||
- Updated all components using "LayoutGroup" to override their OnDisable.
|
||||
- Updated validation in the new MinMaxSlider.
|
||||
- Updated Editor create options to add the correct Event System Input manager.
|
||||
- Updated initialisation logic to not cause an endless loop in the TabNavigationHelper.
|
||||
- Updated "Action" use to "UnityAction" to avoid Unity issues for DropDowns.
|
||||
- Updated UIVerticalScroller for standards.
|
||||
- Updated ReorderableList/ReorderableListElement to prevent creating a fake object for non-transferable items.
|
||||
- Updated panel drawing for ComboBox controls and added DropdownOffset.
|
||||
- Updated build issue with ReorderableListElement.
|
||||
- Updated NonDrawingGraphic to require a CanvasRender, else it causes an error on run.
|
||||
|
||||
## Deprecated
|
||||
|
||||
- All deprecated Text based components now have "obsolete" tags, to avoid breaking code. Note, these do not function in 2022 and above, as Unity have "changed" things. For any affected component, I recommend updating to use TextMeshPro native features.
|
||||
- Marked ScrollPositionController as Obsolete, users should use the new Scoller.
|
||||
- BestFitOutline - Deprecated in Unity 2020 onwards. (still available for earlier versions)
|
||||
- NicerOutline - Deprecated in Unity 2020 onwards. (still available for earlier versions)
|
||||
- Marked TileSizeFitter as obsolete as Unity has made this unworkable.
|
||||
|
||||
- [UI Extensions Issue log](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/issues)
|
||||
## Fixed
|
||||
|
||||
- Resolved issues with DisplayAbove and using a 0 ItemsToDisplay for ComboBox controls.
|
||||
- Resolved startup issue that prevented the control from being used (Unity changed the start order in some instances), this was causing null reference issues with comboboxes.
|
||||
- Patch fix for UILineRenderer.
|
||||
- Resolves issue where the lower range value would become stuck when moving.
|
||||
- Updated Infinite scroll to work with content of different sizes.
|
||||
- Updated Dropdown list to NOT resize text Rect on draw.
|
||||
- Revised the Curly UI fix as it was preventing the graphic from being updated in the scene view.
|
||||
- Cleanup and ensuring the UIParticleSystem is disposed in onDestroy correctly.
|
||||
- Clean up range slider unused variables.
|
||||
|
||||
* [UI Extensions Issue log](https://github.com/Unity-UI-Extensions/com.unity.uiextensions/issues)
|
||||
|
||||
## Upgrade Notes
|
||||
|
||||
|
|
@ -174,8 +209,6 @@ There are almost 70+ extension controls / effect and other utilities in the proj
|
|||
|NicerOutline|RaycastMask|UIFlippable|UIImageCrop|SoftAlphaMask|
|
||||
|CylinderText|UIParticleSystem|CurlyUI|Shine Effect|Shader Effects|
|
||||
|
||||
> Text Effects are not supported with TextMeshPro due to its architecture, try using the native TextMeshPro effects instead.
|
||||
|
||||
[Additional Components](https://unity-ui-extensions.github.io/Controls.html#additional-components)
|
||||
|
||||
|ReturnKeyTrigger|TabNavigation|uGUITools|ScrollRectTweener|ScrollRectLinker|
|
||||
|
|
@ -216,9 +249,9 @@ Got a script you want added? Then just fork the [GitHub repository](https://gith
|
|||
|
||||
Just ensure:
|
||||
|
||||
- The header of the script should match the standard used in all scripts.
|
||||
- The script uses the **Unity.UI.Extensions** namespace so they do not affect any other developments.
|
||||
- (optional) Add Component and Editor options where possible. (editor options are in the Editor\UIExtensionsMenuOptions.cs file)
|
||||
* The header of the script should match the standard used in all scripts.
|
||||
* The script uses the **Unity.UI.Extensions** namespace so they do not affect any other developments.
|
||||
* (optional) Add Component and Editor options where possible. (editor options are in the Editor\UIExtensionsMenuOptions.cs file)
|
||||
|
||||
## [License](https://raw.githubusercontent.com/Unity-UI-Extensions/com.unity.uiextensions/release/LICENSE.md)
|
||||
|
||||
|
|
@ -231,7 +264,7 @@ Check out the [page on my blog](http://bit.ly/Unity3DUIEssentials) for more deta
|
|||
|
||||
## [The downloads](https://unity-ui-extensions.github.io/Downloads)
|
||||
|
||||
As this repo was created to support my new Unity UI Title ["Unity 3D UI Essentials"](http://bit.ly/Unity3DUIEssentials), in the downloads section you will find two custom assets (SpaceShip-DemoScene-Start.unitypackage and RollABallSample-Start.unitypackage). These are just here as starter scenes for doing UI tasks in the book.
|
||||
As this repo was created to support my new Unity UI Title ["Unity 3D UI Essentials"](http://bit.ly/Unity3DUIEssentials), in the downloads section you will find two custom assets (SpaceShip-DemoScene-Start.unitypackage and RollABallSample-Start.unitypackage). These are just here as starter scenes for doing UI tasks in the book.
|
||||
|
||||
I will add more sample scenes for the UI examples in this repository and detail them above over time.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,225 +2,217 @@
|
|||
///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine.UI.Extensions.Tweens;
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
[RequireComponent(typeof(RectTransform), typeof(LayoutElement))]
|
||||
[AddComponentMenu("UI/Extensions/Accordion/Accordion Element")]
|
||||
public class AccordionElement : Toggle
|
||||
{
|
||||
[AddComponentMenu("UI/Extensions/Accordion/Accordion Element")]
|
||||
public class AccordionElement : Toggle
|
||||
{
|
||||
|
||||
[SerializeField] private float m_MinHeight = 18f;
|
||||
[SerializeField] private float m_MinHeight = 18f;
|
||||
|
||||
public float MinHeight => m_MinHeight;
|
||||
public float MinHeight => m_MinHeight;
|
||||
|
||||
[SerializeField] private float m_MinWidth = 40f;
|
||||
[SerializeField] private float m_MinWidth = 40f;
|
||||
|
||||
public float MinWidth => m_MinWidth;
|
||||
public float MinWidth => m_MinWidth;
|
||||
|
||||
private Accordion m_Accordion;
|
||||
private RectTransform m_RectTransform;
|
||||
private LayoutElement m_LayoutElement;
|
||||
private Accordion m_Accordion;
|
||||
private RectTransform m_RectTransform;
|
||||
private LayoutElement m_LayoutElement;
|
||||
|
||||
[NonSerialized]
|
||||
private readonly TweenRunner<FloatTween> m_FloatTweenRunner;
|
||||
[NonSerialized]
|
||||
private readonly TweenRunner<FloatTween> m_FloatTweenRunner;
|
||||
|
||||
protected AccordionElement()
|
||||
{
|
||||
if (this.m_FloatTweenRunner == null)
|
||||
this.m_FloatTweenRunner = new TweenRunner<FloatTween>();
|
||||
protected AccordionElement()
|
||||
{
|
||||
if (this.m_FloatTweenRunner == null)
|
||||
this.m_FloatTweenRunner = new TweenRunner<FloatTween>();
|
||||
|
||||
this.m_FloatTweenRunner.Init(this);
|
||||
}
|
||||
this.m_FloatTweenRunner.Init(this);
|
||||
}
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
base.transition = Transition.None;
|
||||
base.toggleTransition = ToggleTransition.None;
|
||||
this.m_Accordion = this.gameObject.GetComponentInParent<Accordion>();
|
||||
this.m_RectTransform = this.transform as RectTransform;
|
||||
this.m_LayoutElement = this.gameObject.GetComponent<LayoutElement>();
|
||||
this.onValueChanged.AddListener(OnValueChanged);
|
||||
}
|
||||
|
||||
private new IEnumerator Start()
|
||||
{
|
||||
base.Start();
|
||||
yield return new WaitForEndOfFrame(); // Wait for the first frame
|
||||
OnValueChanged(this.isOn);
|
||||
}
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
base.transition = Transition.None;
|
||||
base.toggleTransition = ToggleTransition.None;
|
||||
this.m_Accordion = this.gameObject.GetComponentInParent<Accordion>();
|
||||
this.m_RectTransform = this.transform as RectTransform;
|
||||
this.m_LayoutElement = this.gameObject.GetComponent<LayoutElement>();
|
||||
this.onValueChanged.AddListener(OnValueChanged);
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
protected override void OnValidate()
|
||||
{
|
||||
base.OnValidate();
|
||||
this.m_Accordion = this.gameObject.GetComponentInParent<Accordion>();
|
||||
protected override void OnValidate()
|
||||
{
|
||||
base.OnValidate();
|
||||
this.m_Accordion = this.gameObject.GetComponentInParent<Accordion>();
|
||||
|
||||
if (this.group == null)
|
||||
{
|
||||
ToggleGroup tg = this.GetComponentInParent<ToggleGroup>();
|
||||
if (this.group == null)
|
||||
{
|
||||
ToggleGroup tg = this.GetComponentInParent<ToggleGroup>();
|
||||
|
||||
if (tg != null)
|
||||
{
|
||||
this.group = tg;
|
||||
}
|
||||
}
|
||||
if (tg != null)
|
||||
{
|
||||
this.group = tg;
|
||||
}
|
||||
}
|
||||
|
||||
LayoutElement le = this.gameObject.GetComponent<LayoutElement>();
|
||||
LayoutElement le = this.gameObject.GetComponent<LayoutElement>();
|
||||
|
||||
if (le != null && m_Accordion != null)
|
||||
{
|
||||
if (this.isOn)
|
||||
{
|
||||
if (le != null && m_Accordion != null)
|
||||
{
|
||||
if (this.isOn)
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
le.preferredHeight = -1f;
|
||||
}
|
||||
le.preferredHeight = -1f;
|
||||
}
|
||||
else
|
||||
{
|
||||
le.preferredWidth = -1f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
le.preferredHeight = this.m_MinHeight;
|
||||
le.preferredWidth = -1f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
le.preferredHeight = this.m_MinHeight;
|
||||
}
|
||||
else
|
||||
{
|
||||
le.preferredWidth = this.m_MinWidth;
|
||||
le.preferredWidth = this.m_MinWidth;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
public void OnValueChanged(bool state)
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return;
|
||||
public void OnValueChanged(bool state)
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return;
|
||||
|
||||
Accordion.Transition transition = (this.m_Accordion != null) ? this.m_Accordion.transition : Accordion.Transition.Instant;
|
||||
Accordion.Transition transition = (this.m_Accordion != null) ? this.m_Accordion.transition : Accordion.Transition.Instant;
|
||||
|
||||
if (transition == Accordion.Transition.Instant && m_Accordion != null)
|
||||
{
|
||||
if (state)
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.m_LayoutElement.preferredHeight = -1f;
|
||||
}
|
||||
if (transition == Accordion.Transition.Instant && m_Accordion != null)
|
||||
{
|
||||
if (state)
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.m_LayoutElement.preferredHeight = -1f;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.m_LayoutElement.preferredWidth = -1f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.m_LayoutElement.preferredHeight = this.m_MinHeight;
|
||||
}
|
||||
this.m_LayoutElement.preferredWidth = -1f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.m_LayoutElement.preferredHeight = this.m_MinHeight;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.m_LayoutElement.preferredWidth = this.m_MinWidth;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (transition == Accordion.Transition.Tween)
|
||||
{
|
||||
if (state)
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.StartTween(this.m_MinHeight, this.GetExpandedHeight());
|
||||
}
|
||||
this.m_LayoutElement.preferredWidth = this.m_MinWidth;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (transition == Accordion.Transition.Tween)
|
||||
{
|
||||
if (state)
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.StartTween(this.m_MinHeight, this.GetExpandedHeight());
|
||||
}
|
||||
else
|
||||
{
|
||||
this.StartTween(this.m_MinWidth, this.GetExpandedWidth());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.StartTween(this.m_RectTransform.rect.height, this.m_MinHeight);
|
||||
}
|
||||
this.StartTween(this.m_MinWidth, this.GetExpandedWidth());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
this.StartTween(this.m_RectTransform.rect.height, this.m_MinHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.StartTween(this.m_RectTransform.rect.width, this.m_MinWidth);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.StartTween(this.m_RectTransform.rect.width, this.m_MinWidth);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected float GetExpandedHeight()
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return this.m_MinHeight;
|
||||
protected float GetExpandedHeight()
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return this.m_MinHeight;
|
||||
|
||||
float originalPrefH = this.m_LayoutElement.preferredHeight;
|
||||
this.m_LayoutElement.preferredHeight = -1f;
|
||||
float h = LayoutUtility.GetPreferredHeight(this.m_RectTransform);
|
||||
this.m_LayoutElement.preferredHeight = originalPrefH;
|
||||
float originalPrefH = this.m_LayoutElement.preferredHeight;
|
||||
this.m_LayoutElement.preferredHeight = -1f;
|
||||
float h = LayoutUtility.GetPreferredHeight(this.m_RectTransform);
|
||||
this.m_LayoutElement.preferredHeight = originalPrefH;
|
||||
|
||||
return h;
|
||||
}
|
||||
return h;
|
||||
}
|
||||
|
||||
protected float GetExpandedWidth()
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return this.m_MinWidth;
|
||||
protected float GetExpandedWidth()
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return this.m_MinWidth;
|
||||
|
||||
float originalPrefW = this.m_LayoutElement.preferredWidth;
|
||||
this.m_LayoutElement.preferredWidth = -1f;
|
||||
float w = LayoutUtility.GetPreferredWidth(this.m_RectTransform);
|
||||
this.m_LayoutElement.preferredWidth = originalPrefW;
|
||||
float originalPrefW = this.m_LayoutElement.preferredWidth;
|
||||
this.m_LayoutElement.preferredWidth = -1f;
|
||||
float w = LayoutUtility.GetPreferredWidth(this.m_RectTransform);
|
||||
this.m_LayoutElement.preferredWidth = originalPrefW;
|
||||
|
||||
return w;
|
||||
}
|
||||
return w;
|
||||
}
|
||||
|
||||
protected void StartTween(float startFloat, float targetFloat)
|
||||
{
|
||||
float duration = (this.m_Accordion != null) ? this.m_Accordion.transitionDuration : 0.3f;
|
||||
protected void StartTween(float startFloat, float targetFloat)
|
||||
{
|
||||
float duration = (this.m_Accordion != null) ? this.m_Accordion.transitionDuration : 0.3f;
|
||||
|
||||
FloatTween info = new FloatTween
|
||||
{
|
||||
duration = duration,
|
||||
startFloat = startFloat,
|
||||
targetFloat = targetFloat
|
||||
};
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
info.AddOnChangedCallback(SetHeight);
|
||||
}
|
||||
FloatTween info = new FloatTween
|
||||
{
|
||||
duration = duration,
|
||||
startFloat = startFloat,
|
||||
targetFloat = targetFloat
|
||||
};
|
||||
if (m_Accordion.ExpandVerticval)
|
||||
{
|
||||
info.AddOnChangedCallback(SetHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
info.AddOnChangedCallback(SetWidth);
|
||||
}
|
||||
info.ignoreTimeScale = true;
|
||||
this.m_FloatTweenRunner.StartTween(info);
|
||||
}
|
||||
info.AddOnChangedCallback(SetWidth);
|
||||
}
|
||||
info.ignoreTimeScale = true;
|
||||
this.m_FloatTweenRunner.StartTween(info);
|
||||
}
|
||||
|
||||
protected void SetHeight(float height)
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return;
|
||||
protected void SetHeight(float height)
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return;
|
||||
|
||||
this.m_LayoutElement.preferredHeight = height;
|
||||
}
|
||||
this.m_LayoutElement.preferredHeight = height;
|
||||
}
|
||||
|
||||
protected void SetWidth(float width)
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return;
|
||||
protected void SetWidth(float width)
|
||||
{
|
||||
if (this.m_LayoutElement == null)
|
||||
return;
|
||||
|
||||
this.m_LayoutElement.preferredWidth = width;
|
||||
}
|
||||
}
|
||||
this.m_LayoutElement.preferredWidth = width;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
///Credit perchik
|
||||
///Sourced from - http://forum.unity3d.com/threads/receive-onclick-event-and-pass-it-on-to-lower-ui-elements.293642/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
|
|
@ -131,9 +132,6 @@ namespace UnityEngine.UI.Extensions
|
|||
[System.Serializable]
|
||||
public class SelectionValidityChangedEvent : Events.UnityEvent<bool> { }
|
||||
|
||||
[System.Serializable]
|
||||
public class ItemSelectedEvent : Events.UnityEvent<string> { }
|
||||
|
||||
[System.Serializable]
|
||||
public class ControlDisabledEvent : Events.UnityEvent<bool> { }
|
||||
|
||||
|
|
@ -144,8 +142,6 @@ namespace UnityEngine.UI.Extensions
|
|||
public SelectionValidityChangedEvent OnSelectionValidityChanged;
|
||||
// fires in both cases
|
||||
public SelectionChangedEvent OnSelectionChanged;
|
||||
// fires when an item is clicked
|
||||
public ItemSelectedEvent OnItemSelected;
|
||||
// fires when item is changed;
|
||||
public ControlDisabledEvent OnControlDisabled;
|
||||
|
||||
|
|
@ -363,10 +359,10 @@ namespace UnityEngine.UI.Extensions
|
|||
/// <param name="item"></param>
|
||||
private void OnItemClicked(string item)
|
||||
{
|
||||
//Debug.Log("item " + item + " clicked");
|
||||
Text = item;
|
||||
_mainInput.text = Text;
|
||||
ToggleDropdownPanel(true);
|
||||
OnItemSelected?.Invoke(Text);
|
||||
}
|
||||
|
||||
private void RedrawPanel()
|
||||
|
|
|
|||
|
|
@ -1,30 +1,29 @@
|
|||
///Credit perchik
|
||||
///Sourced from - http://forum.unity3d.com/threads/receive-onclick-event-and-pass-it-on-to-lower-ui-elements.293642/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Extension to the UI class which creates a dropdown list
|
||||
/// </summary>
|
||||
[RequireComponent(typeof(RectTransform))]
|
||||
/// <summary>
|
||||
/// Extension to the UI class which creates a dropdown list
|
||||
/// </summary>
|
||||
[RequireComponent(typeof(RectTransform))]
|
||||
[AddComponentMenu("UI/Extensions/ComboBox/Dropdown List")]
|
||||
public class DropDownList : MonoBehaviour
|
||||
{
|
||||
public Color disabledTextColor;
|
||||
public DropDownListItem SelectedItem { get; private set; } //outside world gets to get this, not set it
|
||||
|
||||
[Header("Dropdown List Items")]
|
||||
public List<DropDownListItem> Items;
|
||||
[Header("Dropdown List Items")]
|
||||
public List<DropDownListItem> Items;
|
||||
|
||||
[Header("Properties")]
|
||||
[Header("Properties")]
|
||||
|
||||
[SerializeField]
|
||||
private bool isActive = true;
|
||||
[SerializeField]
|
||||
private bool isActive = true;
|
||||
|
||||
public bool OverrideHighlighted = true;
|
||||
public bool OverrideHighlighted = true;
|
||||
|
||||
//private bool isInitialized = false;
|
||||
private bool _isPanelActive = false;
|
||||
|
|
@ -47,13 +46,10 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
private List<DropDownListButton> _panelItems = new List<DropDownListButton>();
|
||||
|
||||
private GameObject _itemTemplate;
|
||||
private GameObject _itemTemplate;
|
||||
private bool _initialized;
|
||||
|
||||
private string _defaultMainButtonCaption = null;
|
||||
private Color _defaultNormalColor;
|
||||
|
||||
[SerializeField]
|
||||
[SerializeField]
|
||||
private float _scrollBarWidth = 20.0f;
|
||||
public float ScrollBarWidth
|
||||
{
|
||||
|
|
@ -65,6 +61,7 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
|
||||
// private int scrollOffset; //offset of the selected item
|
||||
private int _selectedIndex = -1;
|
||||
|
||||
[SerializeField]
|
||||
|
|
@ -79,42 +76,42 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
|
||||
[SerializeField]
|
||||
private float dropdownOffset;
|
||||
[SerializeField]
|
||||
private float dropdownOffset;
|
||||
|
||||
[SerializeField]
|
||||
private bool _displayPanelAbove = false;
|
||||
[SerializeField]
|
||||
private bool _displayPanelAbove = false;
|
||||
|
||||
public bool SelectFirstItemOnStart = false;
|
||||
public bool SelectFirstItemOnStart = false;
|
||||
|
||||
[SerializeField]
|
||||
private int selectItemIndexOnStart = 0;
|
||||
private bool shouldSelectItemOnStart => SelectFirstItemOnStart || selectItemIndexOnStart > 0;
|
||||
[SerializeField]
|
||||
private int selectItemIndexOnStart = 0;
|
||||
private bool shouldSelectItemOnStart => SelectFirstItemOnStart || selectItemIndexOnStart > 0;
|
||||
|
||||
[System.Serializable]
|
||||
[System.Serializable]
|
||||
public class SelectionChangedEvent : Events.UnityEvent<int> { }
|
||||
|
||||
// fires when item is changed;
|
||||
[Header("Events")]
|
||||
public SelectionChangedEvent OnSelectionChanged;
|
||||
// fires when item is changed;
|
||||
[Header("Events")]
|
||||
public SelectionChangedEvent OnSelectionChanged;
|
||||
|
||||
[System.Serializable]
|
||||
public class ControlDisabledEvent : Events.UnityEvent<bool> { }
|
||||
[System.Serializable]
|
||||
public class ControlDisabledEvent : Events.UnityEvent<bool> { }
|
||||
|
||||
// fires when item changes between enabled and disabled;
|
||||
public ControlDisabledEvent OnControlDisabled;
|
||||
// fires when item is changed;
|
||||
public ControlDisabledEvent OnControlDisabled;
|
||||
|
||||
public void Start()
|
||||
{
|
||||
Initialize();
|
||||
if (shouldSelectItemOnStart && Items.Count > 0)
|
||||
{
|
||||
SelectItemIndex(SelectFirstItemOnStart ? 0 : selectItemIndexOnStart);
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
public void Start()
|
||||
{
|
||||
Initialize();
|
||||
if (shouldSelectItemOnStart && Items.Count > 0)
|
||||
{
|
||||
SelectItemIndex(SelectFirstItemOnStart ? 0 : selectItemIndexOnStart);
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
private bool Initialize()
|
||||
private bool Initialize()
|
||||
{
|
||||
if (_initialized) return true;
|
||||
|
||||
|
|
@ -124,9 +121,6 @@ namespace UnityEngine.UI.Extensions
|
|||
_rectTransform = GetComponent<RectTransform>();
|
||||
_mainButton = new DropDownListButton(_rectTransform.Find("MainButton").gameObject);
|
||||
|
||||
_defaultMainButtonCaption = _mainButton.txt.text;
|
||||
_defaultNormalColor = _mainButton.btn.colors.normalColor;
|
||||
|
||||
_overlayRT = _rectTransform.Find("Overlay").GetComponent<RectTransform>();
|
||||
_overlayRT.gameObject.SetActive(false);
|
||||
_scrollPanelRT = _overlayRT.Find("ScrollPanel").GetComponent<RectTransform>();
|
||||
|
|
@ -153,32 +147,32 @@ namespace UnityEngine.UI.Extensions
|
|||
Debug.LogError("Something is setup incorrectly with the dropdownlist component causing a Null Reference Exception");
|
||||
success = false;
|
||||
}
|
||||
_initialized = true;
|
||||
_initialized = true;
|
||||
|
||||
RebuildPanel();
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
return success;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// Update the drop down selection to a specific index
|
||||
/// </summary>
|
||||
/// <param name="index"></param>
|
||||
public void SelectItemIndex(int index)
|
||||
{
|
||||
ToggleDropdownPanel();
|
||||
OnItemClicked(index);
|
||||
}
|
||||
{
|
||||
ToggleDropdownPanel(false);
|
||||
OnItemClicked(index);
|
||||
}
|
||||
|
||||
// currently just using items in the list instead of being able to add to it.
|
||||
/// <summary>
|
||||
/// Rebuilds the list from a new collection.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// NOTE, this will clear all existing items
|
||||
/// </remarks>
|
||||
/// <param name="list"></param>
|
||||
public void RefreshItems(params object[] list)
|
||||
// currently just using items in the list instead of being able to add to it.
|
||||
/// <summary>
|
||||
/// Rebuilds the list from a new collection.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// NOTE, this will clear all existing items
|
||||
/// </remarks>
|
||||
/// <param name="list"></param>
|
||||
public void RefreshItems(params object[] list)
|
||||
{
|
||||
Items.Clear();
|
||||
List<DropDownListItem> ddItems = new List<DropDownListItem>();
|
||||
|
|
@ -203,94 +197,76 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
Items.AddRange(ddItems);
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds an additional item to the drop down list (recommended)
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type DropDownListItem</param>
|
||||
public void AddItem(DropDownListItem item)
|
||||
{
|
||||
/// <summary>
|
||||
/// Adds an additional item to the drop down list (recommended)
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type DropDownListItem</param>
|
||||
public void AddItem(DropDownListItem item)
|
||||
{
|
||||
Items.Add(item);
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds an additional drop down list item using a string name
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type String</param>
|
||||
public void AddItem(string item)
|
||||
/// <summary>
|
||||
/// Adds an additional drop down list item using a string name
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type String</param>
|
||||
public void AddItem(string item)
|
||||
{
|
||||
Items.Add(new DropDownListItem(caption: (string)item));
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds an additional drop down list item using a sprite image
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type UI Sprite</param>
|
||||
public void AddItem(Sprite item)
|
||||
/// <summary>
|
||||
/// Adds an additional drop down list item using a sprite image
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type UI Sprite</param>
|
||||
public void AddItem(Sprite item)
|
||||
{
|
||||
Items.Add(new DropDownListItem(image: (Sprite)item));
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes an item from the drop down list (recommended)
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type DropDownListItem</param>
|
||||
public void RemoveItem(DropDownListItem item)
|
||||
/// <summary>
|
||||
/// Removes an item from the drop down list (recommended)
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type DropDownListItem</param>
|
||||
public void RemoveItem(DropDownListItem item)
|
||||
{
|
||||
Items.Remove(item);
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes an item from the drop down list item using a string name
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type String</param>
|
||||
public void RemoveItem(string item)
|
||||
/// <summary>
|
||||
/// Removes an item from the drop down list item using a string name
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type String</param>
|
||||
public void RemoveItem(string item)
|
||||
{
|
||||
Items.Remove(new DropDownListItem(caption: (string)item));
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes an item from the drop down list item using a sprite image
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type UI Sprite</param>
|
||||
public void RemoveItem(Sprite item)
|
||||
/// <summary>
|
||||
/// Removes an item from the drop down list item using a sprite image
|
||||
/// </summary>
|
||||
/// <param name="item">Item of type UI Sprite</param>
|
||||
public void RemoveItem(Sprite item)
|
||||
{
|
||||
Items.Remove(new DropDownListItem(image: (Sprite)item));
|
||||
RebuildPanel();
|
||||
RedrawPanel();
|
||||
}
|
||||
RedrawPanel();
|
||||
}
|
||||
|
||||
public void ResetDropDown()
|
||||
{
|
||||
if (!_initialized)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_mainButton.txt.text = _defaultMainButtonCaption;
|
||||
for (int i = 0; i < _itemsPanelRT.childCount; i++)
|
||||
{
|
||||
_panelItems[i].btnImg.color = _defaultNormalColor;
|
||||
}
|
||||
|
||||
_selectedIndex = -1;
|
||||
_initialized = false;
|
||||
Initialize();
|
||||
}
|
||||
|
||||
public void ResetItems()
|
||||
public void ResetItems()
|
||||
{
|
||||
Items.Clear();
|
||||
RebuildPanel();
|
||||
|
|
@ -351,7 +327,7 @@ namespace UnityEngine.UI.Extensions
|
|||
if (indx != _selectedIndex && OnSelectionChanged != null) OnSelectionChanged.Invoke(indx);
|
||||
|
||||
_selectedIndex = indx;
|
||||
ToggleDropdownPanel();
|
||||
ToggleDropdownPanel(true);
|
||||
UpdateSelected();
|
||||
}
|
||||
|
||||
|
|
@ -373,25 +349,25 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
_mainButton.txt.text = SelectedItem.Caption;
|
||||
|
||||
//update selected index color
|
||||
if (OverrideHighlighted)
|
||||
{
|
||||
for (int i = 0; i < _itemsPanelRT.childCount; i++)
|
||||
{
|
||||
_panelItems[i].btnImg.color = (_selectedIndex == i) ? _mainButton.btn.colors.highlightedColor : new Color(0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
//update selected index color
|
||||
if (OverrideHighlighted)
|
||||
{
|
||||
for (int i = 0; i < _itemsPanelRT.childCount; i++)
|
||||
{
|
||||
_panelItems[i].btnImg.color = (_selectedIndex == i) ? _mainButton.btn.colors.highlightedColor : new Color(0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void RedrawPanel()
|
||||
{
|
||||
float scrollbarWidth = _panelItems.Count > ItemsToDisplay ? _scrollBarWidth : 0f;//hide the scrollbar if there's not enough items
|
||||
_scrollBarRT.gameObject.SetActive(_panelItems.Count > ItemsToDisplay);
|
||||
|
||||
float dropdownHeight = _itemsToDisplay > 0 ? _rectTransform.sizeDelta.y * Mathf.Min(_itemsToDisplay, _panelItems.Count) : _rectTransform.sizeDelta.y * _panelItems.Count;
|
||||
dropdownHeight += dropdownOffset;
|
||||
float dropdownHeight = _itemsToDisplay > 0 ? _rectTransform.sizeDelta.y * Mathf.Min(_itemsToDisplay, _panelItems.Count) : _rectTransform.sizeDelta.y * _panelItems.Count;
|
||||
dropdownHeight += dropdownOffset;
|
||||
|
||||
if (!_hasDrawnOnce || _rectTransform.sizeDelta != _mainButton.rectTransform.sizeDelta)
|
||||
if (!_hasDrawnOnce || _rectTransform.sizeDelta != _mainButton.rectTransform.sizeDelta)
|
||||
{
|
||||
_hasDrawnOnce = true;
|
||||
_mainButton.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, _rectTransform.sizeDelta.x);
|
||||
|
|
@ -401,12 +377,12 @@ namespace UnityEngine.UI.Extensions
|
|||
itemsRemaining = itemsRemaining < 0 ? 0 : itemsRemaining;
|
||||
|
||||
_scrollPanelRT.SetParent(transform, true);
|
||||
_scrollPanelRT.anchoredPosition = _displayPanelAbove ?
|
||||
new Vector2(0, dropdownOffset + dropdownHeight) :
|
||||
new Vector2(0, -(dropdownOffset + _rectTransform.sizeDelta.y));
|
||||
_scrollPanelRT.anchoredPosition = _displayPanelAbove ?
|
||||
new Vector2(0, dropdownOffset + dropdownHeight) :
|
||||
new Vector2(0, -(dropdownOffset + _rectTransform.sizeDelta.y));
|
||||
|
||||
//make the overlay fill the screen
|
||||
_overlayRT.SetParent(_canvas.transform, false);
|
||||
//make the overlay fill the screen
|
||||
_overlayRT.SetParent(_canvas.transform, false);
|
||||
_overlayRT.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, _canvasRT.sizeDelta.x);
|
||||
_overlayRT.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, _canvasRT.sizeDelta.y);
|
||||
|
||||
|
|
@ -416,7 +392,7 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
if (_panelItems.Count < 1) return;
|
||||
|
||||
_scrollPanelRT.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, dropdownHeight);
|
||||
_scrollPanelRT.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, dropdownHeight);
|
||||
_scrollPanelRT.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, _rectTransform.sizeDelta.x);
|
||||
|
||||
_itemsPanelRT.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, _scrollPanelRT.sizeDelta.x - scrollbarWidth - 5);
|
||||
|
|
@ -431,63 +407,38 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Toggle the drop down list if it is active
|
||||
/// Toggle the drop down list
|
||||
/// </summary>
|
||||
/// <param name="directClick">Retained for backwards compatibility only.</param>
|
||||
[Obsolete("DirectClick Parameter is no longer required")]
|
||||
public void ToggleDropdownPanel(bool directClick = false)
|
||||
/// <param name="directClick"> whether an item was directly clicked on</param>
|
||||
public void ToggleDropdownPanel(bool directClick)
|
||||
{
|
||||
ToggleDropdownPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Toggle the drop down list if it is active
|
||||
/// </summary>
|
||||
public void ToggleDropdownPanel()
|
||||
{
|
||||
if (!isActive)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!isActive) return;
|
||||
|
||||
_overlayRT.transform.localScale = new Vector3(1, 1, 1);
|
||||
_scrollBarRT.transform.localScale = new Vector3(1, 1, 1);
|
||||
_isPanelActive = !_isPanelActive;
|
||||
_overlayRT.gameObject.SetActive(_isPanelActive);
|
||||
|
||||
if (_isPanelActive)
|
||||
{
|
||||
transform.SetAsLastSibling();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Hides the drop down panel if its visible at the moment
|
||||
/// </summary>
|
||||
public void HideDropDownPanel()
|
||||
{
|
||||
if (!_isPanelActive)
|
||||
else if (directClick)
|
||||
{
|
||||
return;
|
||||
// scrollOffset = Mathf.RoundToInt(itemsPanelRT.anchoredPosition.y / _rectTransform.sizeDelta.y);
|
||||
}
|
||||
|
||||
ToggleDropdownPanel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the control and sets its active status, determines whether the dropdown will open ot not
|
||||
/// and takes care of the underlying button to follow the status.
|
||||
/// </summary>
|
||||
/// <param name="status"></param>
|
||||
public void SetActive(bool status)
|
||||
{
|
||||
if (status == isActive)
|
||||
{
|
||||
return;
|
||||
}
|
||||
isActive = status;
|
||||
OnControlDisabled?.Invoke(isActive);
|
||||
_mainButton.btn.enabled = isActive;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Updates the control and sets its active status, determines whether the dropdown will open ot not
|
||||
/// </summary>
|
||||
/// <param name="status"></param>
|
||||
public void SetActive(bool status)
|
||||
{
|
||||
if (status != isActive)
|
||||
{
|
||||
OnControlDisabled?.Invoke(status);
|
||||
}
|
||||
isActive = status;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,11 +13,7 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
void Awake()
|
||||
{
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
foreach (var list in FindObjectsByType<ReorderableList>(FindObjectsSortMode.None))
|
||||
#else
|
||||
foreach (var list in FindObjectsOfType<ReorderableList>())
|
||||
#endif
|
||||
{
|
||||
list.OnElementDropped.AddListener(ElementDropped);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,11 +169,7 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
// If we do not have a group of selectables already set, we'll just loop through every object that's a monobehaviour, and look for selectable interfaces in them
|
||||
if (selectableGroup == null) {
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
behavioursToGetSelectionsFrom = GameObject.FindObjectsByType<MonoBehaviour>(FindObjectsSortMode.None);
|
||||
#else
|
||||
behavioursToGetSelectionsFrom = GameObject.FindObjectsOfType<MonoBehaviour>();
|
||||
#endif
|
||||
} else {
|
||||
behavioursToGetSelectionsFrom = selectableGroup;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -367,14 +367,5 @@ namespace UnityEngine.UI.Extensions
|
|||
eventData.useDragThreshold = false;
|
||||
}
|
||||
|
||||
public void SetXWithoutNotify(float x)
|
||||
{
|
||||
SetX(x, false);
|
||||
}
|
||||
|
||||
public void SetYWithoutNotify(float y)
|
||||
{
|
||||
SetY(y, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,10 @@
|
|||
/// Sourced from - http://forum.unity3d.com/members/melang.593409/
|
||||
/// NOT supported in Unity 2022
|
||||
|
||||
using System;
|
||||
#if !UNITY_2022_1_OR_NEWER
|
||||
using System.Collections.Generic;
|
||||
#endif
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[Obsolete("BestFitOutline is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
|
||||
public class BestFitOutline : Shadow
|
||||
{
|
||||
}
|
||||
#else
|
||||
[AddComponentMenu("UI/Effects/Extensions/BestFit Outline")]
|
||||
public class BestFitOutline : Shadow
|
||||
{
|
||||
|
|
@ -70,5 +61,5 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,18 +1,13 @@
|
|||
|
||||
using System;
|
||||
/// Credit Breyer
|
||||
/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/#post-1777407
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[Obsolete("CurvedText is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
|
||||
public class CurvedText : BaseMeshEffect
|
||||
{
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
}
|
||||
}
|
||||
[RequireComponent(typeof(TMPro.TMP_Text))]
|
||||
#else
|
||||
[RequireComponent(typeof(Text))]
|
||||
#endif
|
||||
[RequireComponent(typeof(RectTransform))]
|
||||
[AddComponentMenu("UI/Effects/Extensions/Curved Text")]
|
||||
public class CurvedText : BaseMeshEffect
|
||||
|
|
@ -91,5 +86,4 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,21 +1,14 @@
|
|||
|
||||
using System;
|
||||
|
||||
/// adaption for cylindrical bending by herbst
|
||||
/// adaption for cylindrical bending by herbst
|
||||
/// Credit Breyer
|
||||
/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/#post-1777407
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[Obsolete("CylinderText is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
|
||||
public class CylinderText : BaseMeshEffect
|
||||
{
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
}
|
||||
}
|
||||
[RequireComponent(typeof(TMPro.TMP_Text))]
|
||||
#else
|
||||
[RequireComponent(typeof(Text))]
|
||||
#endif
|
||||
[RequireComponent(typeof(RectTransform))]
|
||||
[AddComponentMenu("UI/Effects/Extensions/Cylinder Text")]
|
||||
public class CylinderText : BaseMeshEffect
|
||||
|
|
@ -63,5 +56,4 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
/*
|
||||
/// Credit Deeperbeige
|
||||
/// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
|
||||
/*
|
||||
|
||||
Produces an simple tracking/letter-spacing effect on UI Text components.
|
||||
|
||||
|
|
@ -38,25 +40,11 @@ use HTML-like tags in your text. Try it out, you'll see what I mean. It doesn't
|
|||
break down entirely, but it doesn't really do what you'd want either.
|
||||
|
||||
*/
|
||||
#if !UNITY_2022_1_OR_NEWER
|
||||
|
||||
using System.Collections.Generic;
|
||||
#endif
|
||||
|
||||
using System;
|
||||
|
||||
/// Credit Deeperbeige
|
||||
/// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[Obsolete("LetterSpacing is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
|
||||
public class LetterSpacing : BaseMeshEffect
|
||||
{
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
}
|
||||
}
|
||||
#else
|
||||
[AddComponentMenu("UI/Effects/Extensions/Letter Spacing")]
|
||||
///Summary
|
||||
/// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
|
||||
|
|
@ -67,13 +55,13 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
protected LetterSpacing() { }
|
||||
|
||||
#if UNITY_EDITOR
|
||||
#if UNITY_EDITOR
|
||||
protected override void OnValidate()
|
||||
{
|
||||
spacing = m_spacing;
|
||||
base.OnValidate();
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
public float spacing
|
||||
{
|
||||
|
|
@ -86,11 +74,6 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
Debug.Log($"Awake, [{m_spacing}]");
|
||||
}
|
||||
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
if (! IsActive()) return;
|
||||
|
|
@ -98,8 +81,11 @@ namespace UnityEngine.UI.Extensions
|
|||
List<UIVertex> verts = new List<UIVertex>();
|
||||
vh.GetUIVertexStream(verts);
|
||||
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
var text = GetComponent<TMPro.TMP_Text>();
|
||||
#else
|
||||
var text = GetComponent<Text>();
|
||||
|
||||
#endif
|
||||
if (text == null)
|
||||
{
|
||||
Debug.LogWarning("LetterSpacing: Missing Text component");
|
||||
|
|
@ -112,6 +98,28 @@ namespace UnityEngine.UI.Extensions
|
|||
float alignmentFactor = 0;
|
||||
int glyphIdx = 0;
|
||||
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
switch (text.alignment)
|
||||
{
|
||||
case TMPro.TextAlignmentOptions.BottomLeft:
|
||||
case TMPro.TextAlignmentOptions.MidlineLeft:
|
||||
case TMPro.TextAlignmentOptions.TopLeft:
|
||||
alignmentFactor = 0f;
|
||||
break;
|
||||
|
||||
case TMPro.TextAlignmentOptions.BottomJustified:
|
||||
case TMPro.TextAlignmentOptions.MidlineJustified:
|
||||
case TMPro.TextAlignmentOptions.TopJustified:
|
||||
alignmentFactor = 0.5f;
|
||||
break;
|
||||
|
||||
case TMPro.TextAlignmentOptions.BottomRight:
|
||||
case TMPro.TextAlignmentOptions.MidlineRight:
|
||||
case TMPro.TextAlignmentOptions.TopRight:
|
||||
alignmentFactor = 1f;
|
||||
break;
|
||||
}
|
||||
#else
|
||||
switch (text.alignment)
|
||||
{
|
||||
case TextAnchor.LowerLeft:
|
||||
|
|
@ -132,6 +140,7 @@ namespace UnityEngine.UI.Extensions
|
|||
alignmentFactor = 1f;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
for (int lineIdx=0; lineIdx < lines.Length; lineIdx++)
|
||||
{
|
||||
|
|
@ -183,5 +192,4 @@ namespace UnityEngine.UI.Extensions
|
|||
vh.AddUIVertexTriangleStream(verts);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
/// Credit herbst / derived from LetterSpacing by Deeperbeige
|
||||
/// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
|
||||
/*
|
||||
|
||||
Produces an simple mono-spacing effect on UI Text components.
|
||||
|
|
@ -38,27 +40,17 @@ use HTML-like tags in your text. Try it out, you'll see what I mean. It doesn't
|
|||
break down entirely, but it doesn't really do what you'd want either.
|
||||
|
||||
*/
|
||||
#if !UNITY_2022_1_OR_NEWER
|
||||
|
||||
using System.Collections.Generic;
|
||||
#endif
|
||||
|
||||
using System;
|
||||
|
||||
/// Credit herbst / derived from LetterSpacing by Deeperbeige
|
||||
/// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[Obsolete("MonoSpacing is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
|
||||
public class MonoSpacing : BaseMeshEffect
|
||||
{
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
}
|
||||
}
|
||||
#else
|
||||
[AddComponentMenu("UI/Effects/Extensions/Mono Spacing")]
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[RequireComponent(typeof(TMPro.TMP_Text))]
|
||||
#else
|
||||
[RequireComponent(typeof(Text))]
|
||||
#endif
|
||||
[RequireComponent(typeof(RectTransform))]
|
||||
///Summary
|
||||
/// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
|
||||
|
|
@ -70,15 +62,21 @@ namespace UnityEngine.UI.Extensions
|
|||
public bool UseHalfCharWidth = false;
|
||||
|
||||
private RectTransform rectTransform;
|
||||
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
private TMPro.TMP_Text text;
|
||||
#else
|
||||
private Text text;
|
||||
#endif
|
||||
|
||||
protected MonoSpacing() { }
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
text = GetComponent<TMPro.TMP_Text>();
|
||||
#else
|
||||
text = GetComponent<Text>();
|
||||
|
||||
#endif
|
||||
if (text == null)
|
||||
{
|
||||
Debug.LogWarning("MonoSpacing: Missing Text component");
|
||||
|
|
@ -87,13 +85,13 @@ namespace UnityEngine.UI.Extensions
|
|||
rectTransform = text.GetComponent<RectTransform>();
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
#if UNITY_EDITOR
|
||||
protected override void OnValidate()
|
||||
{
|
||||
Spacing = m_spacing;
|
||||
base.OnValidate();
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
public float Spacing
|
||||
{
|
||||
|
|
@ -119,6 +117,28 @@ namespace UnityEngine.UI.Extensions
|
|||
float alignmentFactor = 0;
|
||||
int glyphIdx = 0;
|
||||
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
switch (text.alignment)
|
||||
{
|
||||
case TMPro.TextAlignmentOptions.BottomLeft:
|
||||
case TMPro.TextAlignmentOptions.MidlineLeft:
|
||||
case TMPro.TextAlignmentOptions.TopLeft:
|
||||
alignmentFactor = 0f;
|
||||
break;
|
||||
|
||||
case TMPro.TextAlignmentOptions.BottomJustified:
|
||||
case TMPro.TextAlignmentOptions.MidlineJustified:
|
||||
case TMPro.TextAlignmentOptions.TopJustified:
|
||||
alignmentFactor = 0.5f;
|
||||
break;
|
||||
|
||||
case TMPro.TextAlignmentOptions.BottomRight:
|
||||
case TMPro.TextAlignmentOptions.MidlineRight:
|
||||
case TMPro.TextAlignmentOptions.TopRight:
|
||||
alignmentFactor = 1f;
|
||||
break;
|
||||
}
|
||||
#else
|
||||
switch (text.alignment)
|
||||
{
|
||||
case TextAnchor.LowerLeft:
|
||||
|
|
@ -139,7 +159,7 @@ namespace UnityEngine.UI.Extensions
|
|||
alignmentFactor = 1f;
|
||||
break;
|
||||
}
|
||||
|
||||
#endif
|
||||
for (int lineIdx=0; lineIdx < lines.Length; lineIdx++)
|
||||
{
|
||||
string line = lines[lineIdx];
|
||||
|
|
@ -201,5 +221,4 @@ namespace UnityEngine.UI.Extensions
|
|||
vh.AddUIVertexTriangleStream(verts);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -1,25 +1,12 @@
|
|||
|
||||
#if !UNITY_2022_1_OR_NEWER
|
||||
using System.Collections.Generic;
|
||||
#endif
|
||||
|
||||
using System;
|
||||
|
||||
/// Credit Melang, Lee Hui
|
||||
/// Sourced from - http://forum.unity3d.com/members/melang.593409/
|
||||
/// GC Alloc fix - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/pull-requests/130
|
||||
/// NOT supported in Unity 2022
|
||||
|
||||
#if !UNITY_2022_1_OR_NEWER
|
||||
using System.Collections.Generic;
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
#if UNITY_2022_1_OR_NEWER
|
||||
[Obsolete("BestFitOutline is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
|
||||
public class NicerOutline : BaseMeshEffect
|
||||
{
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
}
|
||||
}
|
||||
#else
|
||||
//An outline that looks a bit nicer than the default one. It has less "holes" in the outline by drawing more copies of the effect
|
||||
[AddComponentMenu("UI/Effects/Extensions/Nicer Outline")]
|
||||
public class NicerOutline : BaseMeshEffect
|
||||
|
|
@ -147,7 +134,7 @@ namespace UnityEngine.UI.Extensions
|
|||
start += ApplyText(m_Verts, vh, start);
|
||||
}
|
||||
|
||||
private int ApplyOutlineNoGC(List<UIVertex> verts, Color32 color, float x, float y, VertexHelper vh, int startIndex)
|
||||
private int ApplyOutlineNoGC(List<UIVertex> verts, Color color, float x, float y, VertexHelper vh, int startIndex)
|
||||
{
|
||||
int length = verts.Count;
|
||||
for (int i = 0; i < length; ++i)
|
||||
|
|
@ -207,5 +194,5 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -16,9 +16,6 @@ namespace UnityEngine.UI.Extensions
|
|||
[Tooltip("Enables 3d rotation for the particles")]
|
||||
public bool use3dRotation = false;
|
||||
|
||||
[Tooltip("Enables using Renderer.lengthScale parameter")]
|
||||
public bool _useLengthScale = false;
|
||||
|
||||
private Transform _transform;
|
||||
private ParticleSystem pSystem;
|
||||
private ParticleSystem.Particle[] particles;
|
||||
|
|
@ -186,6 +183,8 @@ namespace UnityEngine.UI.Extensions
|
|||
#else
|
||||
Vector2 position = (pSystem.simulationSpace == ParticleSystemSimulationSpace.Local ? particle.position : _transform.InverseTransformPoint(particle.position));
|
||||
#endif
|
||||
float rotation = -particle.rotation * Mathf.Deg2Rad;
|
||||
float rotation90 = rotation + Mathf.PI / 2;
|
||||
Color32 color = particle.GetCurrentColor(pSystem);
|
||||
float size = particle.GetCurrentSize(pSystem) * 0.5f;
|
||||
|
||||
|
|
@ -281,29 +280,13 @@ namespace UnityEngine.UI.Extensions
|
|||
_quad[3].color = color;
|
||||
_quad[3].uv0 = temp;
|
||||
|
||||
|
||||
float rotation = -particle.rotation * Mathf.Deg2Rad;
|
||||
var lengthScale = pRenderer.lengthScale;
|
||||
if (_useLengthScale)
|
||||
{
|
||||
// rotate towards velocity
|
||||
var normalizedVelocity = particle.velocity.normalized;
|
||||
rotation = Mathf.Atan2(normalizedVelocity.y, normalizedVelocity.x);
|
||||
}
|
||||
else
|
||||
{
|
||||
lengthScale = 1f;
|
||||
}
|
||||
|
||||
float rotation90 = rotation + Mathf.PI / 2;
|
||||
|
||||
if (rotation == 0)
|
||||
{
|
||||
// no rotation
|
||||
corner1.x = position.x - size;
|
||||
corner1.y = position.y - size * lengthScale;
|
||||
corner1.y = position.y - size;
|
||||
corner2.x = position.x + size;
|
||||
corner2.y = position.y + size * lengthScale;
|
||||
corner2.y = position.y + size;
|
||||
|
||||
temp.x = corner1.x;
|
||||
temp.y = corner1.y;
|
||||
|
|
@ -356,7 +339,7 @@ namespace UnityEngine.UI.Extensions
|
|||
else
|
||||
{
|
||||
// apply rotation
|
||||
Vector2 right = new Vector2(Mathf.Cos(rotation), Mathf.Sin(rotation)) * size * lengthScale;
|
||||
Vector2 right = new Vector2(Mathf.Cos(rotation), Mathf.Sin(rotation)) * size;
|
||||
Vector2 up = new Vector2(Mathf.Cos(rotation90), Mathf.Sin(rotation90)) * size;
|
||||
|
||||
_quad[0].position = position - right - up;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
/// Vertical Flow by Ramon Molossi
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
|
|
@ -18,32 +17,27 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
public enum Axis { Horizontal = 0, Vertical = 1 }
|
||||
|
||||
private float _layoutHeight;
|
||||
private float _layoutWidth;
|
||||
|
||||
public float SpacingX = 0f;
|
||||
public float SpacingX = 0f;
|
||||
public float SpacingY = 0f;
|
||||
public bool ExpandHorizontalSpacing = false;
|
||||
|
||||
public bool ChildForceExpandWidth = false;
|
||||
public bool ChildForceExpandHeight = false;
|
||||
public bool invertOrder = false;
|
||||
private float _layoutHeight;
|
||||
private float _layoutWidth;
|
||||
|
||||
[SerializeField]
|
||||
protected Axis m_StartAxis = Axis.Horizontal;
|
||||
|
||||
public Axis StartAxis { get { return m_StartAxis; } set { SetProperty(ref m_StartAxis, value); } }
|
||||
[SerializeField] protected Axis m_StartAxis = Axis.Horizontal;
|
||||
public Axis startAxis { get { return m_StartAxis; } set { SetProperty(ref m_StartAxis, value); } }
|
||||
|
||||
public override void CalculateLayoutInputHorizontal()
|
||||
{
|
||||
if (StartAxis == Axis.Horizontal)
|
||||
{
|
||||
base.CalculateLayoutInputHorizontal();
|
||||
var minWidth = GetGreatestMinimumChildWidth() + padding.left + padding.right;
|
||||
SetLayoutInputForAxis(minWidth, -1, -1, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
_layoutWidth = SetLayout(0, true);
|
||||
if (startAxis == Axis.Horizontal) {
|
||||
base.CalculateLayoutInputHorizontal ();
|
||||
var minWidth = GetGreatestMinimumChildWidth () + padding.left + padding.right;
|
||||
SetLayoutInputForAxis (minWidth, -1, -1, 0);
|
||||
} else {
|
||||
_layoutWidth = SetLayout (0, true);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -60,36 +54,49 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
public override void CalculateLayoutInputVertical()
|
||||
{
|
||||
if (StartAxis == Axis.Horizontal)
|
||||
{
|
||||
_layoutHeight = SetLayout(1, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.CalculateLayoutInputHorizontal();
|
||||
var minHeight = GetGreatestMinimumChildHeigth() + padding.bottom + padding.top;
|
||||
SetLayoutInputForAxis(minHeight, -1, -1, 1);
|
||||
if (startAxis == Axis.Horizontal) {
|
||||
_layoutHeight = SetLayout (1, true);
|
||||
} else {
|
||||
base.CalculateLayoutInputHorizontal ();
|
||||
var minHeight = GetGreatestMinimumChildHeigth () + padding.bottom + padding.top;
|
||||
SetLayoutInputForAxis (minHeight, -1, -1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
protected bool IsCenterAlign
|
||||
{
|
||||
get => childAlignment == TextAnchor.LowerCenter || childAlignment == TextAnchor.MiddleCenter || childAlignment == TextAnchor.UpperCenter;
|
||||
get
|
||||
{
|
||||
return childAlignment == TextAnchor.LowerCenter || childAlignment == TextAnchor.MiddleCenter ||
|
||||
childAlignment == TextAnchor.UpperCenter;
|
||||
}
|
||||
}
|
||||
|
||||
protected bool IsRightAlign
|
||||
{
|
||||
get => childAlignment == TextAnchor.LowerRight || childAlignment == TextAnchor.MiddleRight || childAlignment == TextAnchor.UpperRight;
|
||||
get
|
||||
{
|
||||
return childAlignment == TextAnchor.LowerRight || childAlignment == TextAnchor.MiddleRight ||
|
||||
childAlignment == TextAnchor.UpperRight;
|
||||
}
|
||||
}
|
||||
|
||||
protected bool IsMiddleAlign
|
||||
{
|
||||
get => childAlignment == TextAnchor.MiddleLeft || childAlignment == TextAnchor.MiddleRight || childAlignment == TextAnchor.MiddleCenter;
|
||||
get
|
||||
{
|
||||
return childAlignment == TextAnchor.MiddleLeft || childAlignment == TextAnchor.MiddleRight ||
|
||||
childAlignment == TextAnchor.MiddleCenter;
|
||||
}
|
||||
}
|
||||
|
||||
protected bool IsLowerAlign
|
||||
{
|
||||
get => childAlignment == TextAnchor.LowerLeft || childAlignment == TextAnchor.LowerRight || childAlignment == TextAnchor.LowerCenter;
|
||||
get
|
||||
{
|
||||
return childAlignment == TextAnchor.LowerLeft || childAlignment == TextAnchor.LowerRight ||
|
||||
childAlignment == TextAnchor.LowerCenter;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -115,34 +122,25 @@ namespace UnityEngine.UI.Extensions
|
|||
float counterOffset = 0;
|
||||
float groupSize = 0;
|
||||
float workingSize = 0;
|
||||
if (StartAxis == Axis.Horizontal)
|
||||
{
|
||||
if (startAxis == Axis.Horizontal) {
|
||||
groupSize = groupHeight;
|
||||
workingSize = groupWidth - padding.left - padding.right;
|
||||
if (IsLowerAlign)
|
||||
{
|
||||
if (IsLowerAlign) {
|
||||
offset = (float)padding.bottom;
|
||||
counterOffset = (float)padding.top;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
offset = (float)padding.top;
|
||||
counterOffset = (float)padding.bottom;
|
||||
}
|
||||
spacingBetweenBars = SpacingY;
|
||||
spacingBetweenElements = SpacingX;
|
||||
}
|
||||
else if (StartAxis == Axis.Vertical)
|
||||
{
|
||||
} else if (startAxis == Axis.Vertical) {
|
||||
groupSize = groupWidth;
|
||||
workingSize = groupHeight - padding.top - padding.bottom;
|
||||
if (IsRightAlign)
|
||||
{
|
||||
if (IsRightAlign) {
|
||||
offset = (float)padding.right;
|
||||
counterOffset = (float)padding.left;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
offset = (float)padding.left;
|
||||
counterOffset = (float)padding.right;
|
||||
}
|
||||
|
|
@ -153,59 +151,50 @@ namespace UnityEngine.UI.Extensions
|
|||
var currentBarSize = 0f;
|
||||
var currentBarSpace = 0f;
|
||||
|
||||
for (var i = 0; i < rectChildren.Count; i++)
|
||||
{
|
||||
for (var i = 0; i < rectChildren.Count; i++) {
|
||||
|
||||
int index = i;
|
||||
var child = rectChildren[index];
|
||||
var child = rectChildren [index];
|
||||
float childSize = 0;
|
||||
float childOtherSize = 0;
|
||||
//get height and width of elements.
|
||||
if (StartAxis == Axis.Horizontal)
|
||||
{
|
||||
if (invertOrder)
|
||||
{
|
||||
if (startAxis == Axis.Horizontal) {
|
||||
if (invertOrder) {
|
||||
index = IsLowerAlign ? rectChildren.Count - 1 - i : i;
|
||||
}
|
||||
child = rectChildren[index];
|
||||
childSize = LayoutUtility.GetPreferredSize(child, 0);
|
||||
childSize = Mathf.Min(childSize, workingSize);
|
||||
childOtherSize = LayoutUtility.GetPreferredSize(child, 1);
|
||||
}
|
||||
else if (StartAxis == Axis.Vertical)
|
||||
{
|
||||
if (invertOrder)
|
||||
{
|
||||
child = rectChildren [index];
|
||||
childSize = LayoutUtility.GetPreferredSize (child, 0);
|
||||
childSize = Mathf.Min (childSize, workingSize);
|
||||
childOtherSize = LayoutUtility.GetPreferredSize (child, 1);
|
||||
} else if (startAxis == Axis.Vertical) {
|
||||
if (invertOrder) {
|
||||
index = IsRightAlign ? rectChildren.Count - 1 - i : i;
|
||||
}
|
||||
child = rectChildren[index];
|
||||
childSize = LayoutUtility.GetPreferredSize(child, 1);
|
||||
childSize = Mathf.Min(childSize, workingSize);
|
||||
childOtherSize = LayoutUtility.GetPreferredSize(child, 0);
|
||||
child = rectChildren [index];
|
||||
childSize = LayoutUtility.GetPreferredSize (child, 1);
|
||||
childSize = Mathf.Min (childSize, workingSize);
|
||||
childOtherSize = LayoutUtility.GetPreferredSize (child, 0);
|
||||
}
|
||||
|
||||
// If adding this element would exceed the bounds of the container,
|
||||
// go to a new bar after processing the current bar
|
||||
if (currentBarSize + childSize > workingSize)
|
||||
{
|
||||
if (currentBarSize + childSize > workingSize) {
|
||||
|
||||
currentBarSize -= spacingBetweenElements;
|
||||
|
||||
// Process current bar elements positioning
|
||||
if (!layoutInput)
|
||||
{
|
||||
if (StartAxis == Axis.Horizontal)
|
||||
{
|
||||
float newOffset = CalculateRowVerticalOffset(groupSize, offset, currentBarSpace);
|
||||
LayoutRow(_itemList, currentBarSize, currentBarSpace, workingSize, padding.left, newOffset, axis);
|
||||
}
|
||||
else if (StartAxis == Axis.Vertical)
|
||||
{
|
||||
float newOffset = CalculateColHorizontalOffset(groupSize, offset, currentBarSpace);
|
||||
LayoutCol(_itemList, currentBarSpace, currentBarSize, workingSize, newOffset, padding.top, axis);
|
||||
if (!layoutInput) {
|
||||
if (startAxis == Axis.Horizontal) {
|
||||
float newOffset = CalculateRowVerticalOffset (groupSize, offset, currentBarSpace);
|
||||
LayoutRow (_itemList, currentBarSize, currentBarSpace, workingSize, padding.left, newOffset, axis);
|
||||
} else if (startAxis == Axis.Vertical) {
|
||||
float newOffset = CalculateColHorizontalOffset (groupSize, offset, currentBarSpace);
|
||||
LayoutCol (_itemList, currentBarSpace, currentBarSize, workingSize, newOffset, padding.top, axis);
|
||||
}
|
||||
}
|
||||
|
||||
// Clear existing bar
|
||||
_itemList.Clear();
|
||||
_itemList.Clear ();
|
||||
|
||||
// Add the current bar space to total barSpace accumulator, and reset to 0 for the next row
|
||||
offset += currentBarSpace;
|
||||
|
|
@ -213,28 +202,31 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
currentBarSpace = 0;
|
||||
currentBarSize = 0;
|
||||
|
||||
}
|
||||
|
||||
currentBarSize += childSize;
|
||||
_itemList.Add(child);
|
||||
_itemList.Add (child);
|
||||
|
||||
// We need the largest element height to determine the starting position of the next line
|
||||
currentBarSpace = childOtherSize > currentBarSpace ? childOtherSize : currentBarSpace;
|
||||
if (childOtherSize > currentBarSpace) {
|
||||
currentBarSpace = childOtherSize;
|
||||
}
|
||||
|
||||
// Don't do this for the last one
|
||||
if (i < rectChildren.Count - 1){
|
||||
currentBarSize += spacingBetweenElements;
|
||||
}
|
||||
|
||||
currentBarSize += spacingBetweenElements;
|
||||
}
|
||||
|
||||
// Layout the final bar
|
||||
if (!layoutInput)
|
||||
{
|
||||
if (StartAxis == Axis.Horizontal)
|
||||
{
|
||||
float newOffset = CalculateRowVerticalOffset(groupHeight, offset, currentBarSpace);
|
||||
if (!layoutInput) {
|
||||
if (startAxis == Axis.Horizontal) {
|
||||
float newOffset = CalculateRowVerticalOffset (groupHeight, offset, currentBarSpace);
|
||||
currentBarSize -= spacingBetweenElements;
|
||||
LayoutRow(_itemList, currentBarSize, currentBarSpace, workingSize, padding.left, newOffset, axis);
|
||||
}
|
||||
else if (StartAxis == Axis.Vertical)
|
||||
{
|
||||
LayoutRow (_itemList, currentBarSize, currentBarSpace, workingSize, padding.left, newOffset, axis);
|
||||
}else if (startAxis == Axis.Vertical) {
|
||||
float newOffset = CalculateColHorizontalOffset(groupWidth, offset, currentBarSpace);
|
||||
currentBarSize -= spacingBetweenElements;
|
||||
LayoutCol(_itemList, currentBarSpace, currentBarSize, workingSize, newOffset, padding.top, axis);
|
||||
|
|
@ -247,8 +239,7 @@ namespace UnityEngine.UI.Extensions
|
|||
offset += currentBarSpace;
|
||||
offset += counterOffset;
|
||||
|
||||
if (layoutInput)
|
||||
{
|
||||
if (layoutInput) {
|
||||
SetLayoutInputForAxis(offset, offset, -1, axis);
|
||||
}
|
||||
return offset;
|
||||
|
|
@ -256,109 +247,87 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
private float CalculateRowVerticalOffset(float groupHeight, float yOffset, float currentRowHeight)
|
||||
{
|
||||
if (IsLowerAlign)
|
||||
{
|
||||
if (IsLowerAlign) {
|
||||
return groupHeight - yOffset - currentRowHeight;
|
||||
}
|
||||
else if (IsMiddleAlign)
|
||||
{
|
||||
} else if (IsMiddleAlign) {
|
||||
return groupHeight * 0.5f - _layoutHeight * 0.5f + yOffset;
|
||||
} else {
|
||||
return yOffset;
|
||||
}
|
||||
return yOffset;
|
||||
}
|
||||
|
||||
private float CalculateColHorizontalOffset(float groupWidth, float xOffset, float currentColWidth)
|
||||
{
|
||||
if (IsRightAlign)
|
||||
{
|
||||
if (IsRightAlign) {
|
||||
return groupWidth - xOffset - currentColWidth;
|
||||
}
|
||||
else if (IsCenterAlign)
|
||||
{
|
||||
} else if (IsCenterAlign) {
|
||||
return groupWidth * 0.5f - _layoutWidth * 0.5f + xOffset;
|
||||
} else {
|
||||
return xOffset;
|
||||
}
|
||||
return xOffset;
|
||||
}
|
||||
|
||||
protected void LayoutRow(IList<RectTransform> contents, float rowWidth, float rowHeight, float maxWidth, float xOffset, float yOffset, int axis)
|
||||
{
|
||||
var xPos = xOffset;
|
||||
|
||||
if (!ChildForceExpandWidth && IsCenterAlign)
|
||||
{
|
||||
if (!ChildForceExpandWidth && IsCenterAlign) {
|
||||
xPos += (maxWidth - rowWidth) * 0.5f;
|
||||
}
|
||||
else if (!ChildForceExpandWidth && IsRightAlign)
|
||||
{
|
||||
} else if (!ChildForceExpandWidth && IsRightAlign) {
|
||||
xPos += (maxWidth - rowWidth);
|
||||
}
|
||||
|
||||
var extraWidth = 0f;
|
||||
var extraSpacing = 0f;
|
||||
|
||||
if (ChildForceExpandWidth)
|
||||
{
|
||||
extraWidth = (maxWidth - rowWidth) / contents.Count;
|
||||
if (ChildForceExpandWidth) {
|
||||
extraWidth = (maxWidth - rowWidth)/_itemList.Count;
|
||||
}
|
||||
else if (ExpandHorizontalSpacing)
|
||||
{
|
||||
extraSpacing = (maxWidth - rowWidth) / (contents.Count - 1);
|
||||
if (contents.Count > 1)
|
||||
{
|
||||
if (IsCenterAlign)
|
||||
{
|
||||
xPos -= extraSpacing * 0.5f * (contents.Count - 1);
|
||||
}
|
||||
else if (IsRightAlign)
|
||||
{
|
||||
xPos -= extraSpacing * (contents.Count - 1);
|
||||
else if (ExpandHorizontalSpacing) {
|
||||
extraSpacing = (maxWidth - rowWidth)/(_itemList.Count - 1);
|
||||
if (_itemList.Count > 1) {
|
||||
if (IsCenterAlign) {
|
||||
xPos -= extraSpacing * 0.5f * (_itemList.Count - 1);
|
||||
} else if (IsRightAlign) {
|
||||
xPos -= extraSpacing * (_itemList.Count - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (var j = 0; j < contents.Count; j++)
|
||||
{
|
||||
var index = IsLowerAlign ? contents.Count - 1 - j : j;
|
||||
for (var j = 0; j < _itemList.Count; j++) {
|
||||
|
||||
var rowChild = contents[index];
|
||||
var index = IsLowerAlign ? _itemList.Count - 1 - j : j;
|
||||
|
||||
var rowChild = _itemList[index];
|
||||
|
||||
var rowChildWidth = LayoutUtility.GetPreferredSize(rowChild, 0) + extraWidth;
|
||||
var rowChildHeight = LayoutUtility.GetPreferredSize(rowChild, 1);
|
||||
|
||||
if (ChildForceExpandHeight)
|
||||
{
|
||||
rowChildHeight = rowHeight;
|
||||
}
|
||||
|
||||
rowChildWidth = Mathf.Min(rowChildWidth, maxWidth);
|
||||
|
||||
var yPos = yOffset;
|
||||
|
||||
if (IsMiddleAlign)
|
||||
{
|
||||
if (IsMiddleAlign) {
|
||||
yPos += (rowHeight - rowChildHeight) * 0.5f;
|
||||
}
|
||||
else if (IsLowerAlign)
|
||||
{
|
||||
} else if (IsLowerAlign) {
|
||||
yPos += (rowHeight - rowChildHeight);
|
||||
}
|
||||
|
||||
if (ExpandHorizontalSpacing && j > 0)
|
||||
{
|
||||
if (ExpandHorizontalSpacing && j > 0) {
|
||||
xPos += extraSpacing;
|
||||
}
|
||||
|
||||
if (axis == 0)
|
||||
{
|
||||
SetChildAlongAxis(rowChild, 0, xPos, rowChildWidth);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetChildAlongAxis(rowChild, 1, yPos, rowChildHeight);
|
||||
if (axis == 0) {
|
||||
SetChildAlongAxis (rowChild, 0, xPos, rowChildWidth);
|
||||
} else {
|
||||
SetChildAlongAxis (rowChild, 1, yPos, rowChildHeight);
|
||||
}
|
||||
|
||||
// Don't do horizontal spacing for the last one
|
||||
if (j < contents.Count - 1)
|
||||
{
|
||||
if (j < _itemList.Count - 1) {
|
||||
xPos += rowChildWidth + SpacingX;
|
||||
}
|
||||
}
|
||||
|
|
@ -368,49 +337,39 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
var yPos = yOffset;
|
||||
|
||||
if (!ChildForceExpandHeight && IsMiddleAlign)
|
||||
{
|
||||
if (!ChildForceExpandHeight && IsMiddleAlign) {
|
||||
yPos += (maxHeight - colHeight) * 0.5f;
|
||||
}
|
||||
else if (!ChildForceExpandHeight && IsLowerAlign)
|
||||
{
|
||||
} else if (!ChildForceExpandHeight && IsLowerAlign) {
|
||||
yPos += (maxHeight - colHeight);
|
||||
}
|
||||
|
||||
var extraHeight = 0f;
|
||||
var extraSpacing = 0f;
|
||||
|
||||
if (ChildForceExpandHeight)
|
||||
{
|
||||
extraHeight = (maxHeight - colHeight) / contents.Count;
|
||||
if (ChildForceExpandHeight) {
|
||||
extraHeight = (maxHeight - colHeight)/_itemList.Count;
|
||||
}
|
||||
else if (ExpandHorizontalSpacing)
|
||||
{
|
||||
extraSpacing = (maxHeight - colHeight) / (contents.Count - 1);
|
||||
if (contents.Count > 1)
|
||||
{
|
||||
if (IsMiddleAlign)
|
||||
{
|
||||
yPos -= extraSpacing * 0.5f * (contents.Count - 1);
|
||||
}
|
||||
else if (IsLowerAlign)
|
||||
{
|
||||
yPos -= extraSpacing * (contents.Count - 1);
|
||||
else if (ExpandHorizontalSpacing) {
|
||||
extraSpacing = (maxHeight - colHeight)/(_itemList.Count - 1);
|
||||
if (_itemList.Count > 1) {
|
||||
if (IsMiddleAlign) {
|
||||
yPos -= extraSpacing * 0.5f * (_itemList.Count - 1);
|
||||
} else if (IsLowerAlign) {
|
||||
yPos -= extraSpacing * (_itemList.Count - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (var j = 0; j < contents.Count; j++)
|
||||
{
|
||||
var index = IsRightAlign ? contents.Count - 1 - j : j;
|
||||
for (var j = 0; j < _itemList.Count; j++) {
|
||||
|
||||
var rowChild = contents[index];
|
||||
var index = IsRightAlign ? _itemList.Count - 1 - j : j;
|
||||
|
||||
var rowChildWidth = LayoutUtility.GetPreferredSize(rowChild, 0);
|
||||
var rowChild = _itemList[index];
|
||||
|
||||
var rowChildWidth = LayoutUtility.GetPreferredSize(rowChild, 0) ;
|
||||
var rowChildHeight = LayoutUtility.GetPreferredSize(rowChild, 1) + extraHeight;
|
||||
|
||||
if (ChildForceExpandWidth)
|
||||
{
|
||||
if (ChildForceExpandWidth) {
|
||||
rowChildWidth = colWidth;
|
||||
}
|
||||
|
||||
|
|
@ -418,32 +377,25 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
var xPos = xOffset;
|
||||
|
||||
if (IsCenterAlign)
|
||||
{
|
||||
if (IsCenterAlign) {
|
||||
xPos += (colWidth - rowChildWidth) * 0.5f;
|
||||
}
|
||||
else if (IsRightAlign)
|
||||
{
|
||||
} else if (IsRightAlign) {
|
||||
xPos += (colWidth - rowChildWidth);
|
||||
}
|
||||
|
||||
if (ExpandHorizontalSpacing && j > 0)
|
||||
{
|
||||
//
|
||||
if (ExpandHorizontalSpacing && j > 0) {
|
||||
yPos += extraSpacing;
|
||||
}
|
||||
|
||||
if (axis == 0)
|
||||
{
|
||||
SetChildAlongAxis(rowChild, 0, xPos, rowChildWidth);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetChildAlongAxis(rowChild, 1, yPos, rowChildHeight);
|
||||
if (axis == 0) {
|
||||
SetChildAlongAxis (rowChild, 0, xPos, rowChildWidth);
|
||||
} else {
|
||||
SetChildAlongAxis (rowChild, 1, yPos, rowChildHeight);
|
||||
}
|
||||
|
||||
// Don't do vertical spacing for the last one
|
||||
if (j < contents.Count - 1)
|
||||
{
|
||||
if (j < _itemList.Count - 1) {
|
||||
yPos += rowChildHeight + SpacingY;
|
||||
}
|
||||
}
|
||||
|
|
@ -452,9 +404,9 @@ namespace UnityEngine.UI.Extensions
|
|||
public float GetGreatestMinimumChildWidth()
|
||||
{
|
||||
var max = 0f;
|
||||
for (var i = 0; i < rectChildren.Count; i++)
|
||||
{
|
||||
for (var i = 0; i < rectChildren.Count; i++) {
|
||||
var w = LayoutUtility.GetMinWidth(rectChildren[i]);
|
||||
|
||||
max = Mathf.Max(w, max);
|
||||
}
|
||||
return max;
|
||||
|
|
@ -463,18 +415,20 @@ namespace UnityEngine.UI.Extensions
|
|||
public float GetGreatestMinimumChildHeigth()
|
||||
{
|
||||
var max = 0f;
|
||||
for (var i = 0; i < rectChildren.Count; i++)
|
||||
{
|
||||
for (var i = 0; i < rectChildren.Count; i++) {
|
||||
var w = LayoutUtility.GetMinHeight(rectChildren[i]);
|
||||
|
||||
max = Mathf.Max(w, max);
|
||||
}
|
||||
return max;
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
{
|
||||
m_Tracker.Clear();
|
||||
LayoutRebuilder.MarkLayoutForRebuild(rectTransform);
|
||||
}
|
||||
}
|
||||
protected override void OnDisable()
|
||||
{
|
||||
m_Tracker.Clear();
|
||||
LayoutRebuilder.MarkLayoutForRebuild(rectTransform);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -223,21 +223,12 @@ namespace UnityEngine.UI.Extensions
|
|||
/// <summary>
|
||||
/// used for changing / updating between screen resolutions
|
||||
/// </summary>
|
||||
public void UpdateLayout(bool resetPositionToStart = false)
|
||||
public void UpdateLayout()
|
||||
{
|
||||
_lerp = false;
|
||||
DistributePages();
|
||||
|
||||
if (resetPositionToStart)
|
||||
{
|
||||
_currentPage = StartingScreen;
|
||||
}
|
||||
|
||||
if (MaskArea)
|
||||
{
|
||||
UpdateVisible();
|
||||
}
|
||||
|
||||
SetScrollContainerPosition();
|
||||
OnCurrentScreenChange(_currentPage);
|
||||
}
|
||||
|
|
@ -337,10 +328,6 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (distance == 0)
|
||||
{
|
||||
EndScreenChange();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,21 +218,11 @@ namespace UnityEngine.UI.Extensions
|
|||
/// <summary>
|
||||
/// used for changing / updating between screen resolutions
|
||||
/// </summary>
|
||||
public void UpdateLayout(bool resetPositionToStart = false)
|
||||
public void UpdateLayout()
|
||||
{
|
||||
_lerp = false;
|
||||
DistributePages();
|
||||
|
||||
if (resetPositionToStart)
|
||||
{
|
||||
_currentPage = StartingScreen;
|
||||
}
|
||||
|
||||
if (MaskArea)
|
||||
{
|
||||
UpdateVisible();
|
||||
}
|
||||
|
||||
if (MaskArea) UpdateVisible();
|
||||
SetScrollContainerPosition();
|
||||
OnCurrentScreenChange(_currentPage);
|
||||
}
|
||||
|
|
@ -331,10 +321,6 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (distance == 0)
|
||||
{
|
||||
EndScreenChange();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ namespace UnityEngine.UI.Extensions
|
|||
PopulateMesh (vh, m_points);
|
||||
|
||||
}
|
||||
if (m_segments != null && m_segments.Count > 0) {
|
||||
else if (m_segments != null && m_segments.Count > 0) {
|
||||
GeneratedUVs ();
|
||||
vh.Clear ();
|
||||
|
||||
|
|
@ -296,6 +296,8 @@ namespace UnityEngine.UI.Extensions
|
|||
PopulateMesh (vh, pointsToDraw);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private UIVertex[] CreateLineCap(Vector2 start, Vector2 end, SegmentType type)
|
||||
|
|
@ -417,7 +419,7 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
return Segments[segmentIndex - 1][index - 1];
|
||||
}
|
||||
else if (Segments?.Count > 0)
|
||||
else if (Segments.Count > 0)
|
||||
{
|
||||
var segmentIndexCount = 0;
|
||||
var indexCount = index;
|
||||
|
|
@ -441,29 +443,6 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the position of a point on the curve, given t (0-1), start point, control points and end point.
|
||||
/// </summary>
|
||||
/// <param name="t">Required Percentage between start and end point, in the range 0 to 1</param>
|
||||
/// <param name="p1">Required Starting point</param>
|
||||
/// <param name="p1">Required Control point 1</param>
|
||||
/// <param name="p1">Required Control point 2</param>
|
||||
/// <param name="p1">Required End point</param>
|
||||
/// <returns>Vector2 position of point on curve at t percentage between p1 and p4</returns>
|
||||
public Vector2 CalculatePointOnCurve(float t, Vector2 p1, Vector2 p2, Vector2 p3, Vector2 p4)
|
||||
{
|
||||
var t2 = t * t;
|
||||
var t3 = t2 * t;
|
||||
|
||||
var x = p1.x + (-p1.x * 3 + t * (3 * p1.x - p1.x * t)) * t + (3 * p2.x + t * (-6 * p2.x + p2.x * 3 * t)) * t +
|
||||
(p3.x * 3 - p3.x * 3 * t) * t2 + p4.x * t3;
|
||||
|
||||
var y = p1.y + (-p1.y * 3 + t * (3 * p1.y - p1.y * t)) * t + (3 * p2.y + t * (-6 * p2.y + p2.y * 3 * t)) * t +
|
||||
(p3.y * 3 - p3.y * 3 * t) * t2 + p4.y * t3;
|
||||
|
||||
return new Vector2(x, y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the Vector2 position of a line within a specific segment
|
||||
/// </summary>
|
||||
|
|
@ -499,10 +478,6 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
m_points = new Vector2[1];
|
||||
}
|
||||
if (transform.GetComponent<RectTransform>().position != Vector3.zero)
|
||||
{
|
||||
Debug.LogWarning("A Line Renderer component should be on a RectTransform positioned at (0,0,0), do not use in child Objects.\nFor best results, create separate RectTransforms as children of the canvas positioned at (0,0) for a UILineRenderer and do not move.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -46,13 +46,7 @@ namespace UnityEngine.UI.Extensions
|
|||
get
|
||||
{
|
||||
if (instance == null)
|
||||
{
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
instance = GameObject.FindFirstObjectByType<BoundTooltipItem>();
|
||||
#else
|
||||
instance = GameObject.FindObjectOfType<BoundTooltipItem>();
|
||||
#endif
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,13 +92,7 @@ namespace UnityEngine.UI.Extensions
|
|||
get
|
||||
{
|
||||
if (instance == null)
|
||||
{
|
||||
#if UNITY_2023_1_OR_NEWER
|
||||
instance = FindFirstObjectByType<ToolTip>();
|
||||
#else
|
||||
instance = FindObjectOfType<ToolTip>();
|
||||
#endif
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,29 @@
|
|||
/// Credit SimonDarksideJ
|
||||
|
||||
using UnityEngine.EventSystems;
|
||||
|
||||
namespace UnityEngine.UI.Extensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Handy Selectable script to un-highlight a selectable component in Unity (e.g. a Button) when the user moves away from it, EVEN IF the user has holding a button on it.
|
||||
/// Resolves the situation where Unity UI Components remain in a highlighted state even after the pointer has moved away (e.g. user holding a button, mouse, pointer down).
|
||||
/// Now whenever the cursor leaves the component, it will force the UI component to revert to un-highlighted.
|
||||
/// </summary>
|
||||
/*
|
||||
Handy Selectable script to un-highlight a selectable component in Unity (e.g. a Button) when the user moves away from it, EVEN IF the user has holding a button on it.
|
||||
|
||||
Resolves the situation where Unity UI Components remain in a highlighted state even after the pointer has moved away (e.g. user holding a button, mouse, pointer down).
|
||||
Now whenever the cursor leaves the component, it will force the UI component to revert to un-highlighted.
|
||||
*/
|
||||
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
[AddComponentMenu("UI/Extensions/ResetSelectableHighlight", 31)]
|
||||
[RequireComponent(typeof(Selectable))]
|
||||
public class ResetSelectableHighlight : MonoBehaviour, IPointerExitHandler
|
||||
{
|
||||
[SerializeField]
|
||||
private Selectable attachedSelectable = null;
|
||||
private Selectable attachedSelectable;
|
||||
|
||||
private void Awake()
|
||||
// Start is called before the first frame update
|
||||
void Awake()
|
||||
{
|
||||
if (attachedSelectable == null || !attachedSelectable)
|
||||
if (!attachedSelectable)
|
||||
{
|
||||
attachedSelectable = GetComponent<Selectable>();
|
||||
}
|
||||
|
|
@ -26,11 +31,6 @@ namespace UnityEngine.UI.Extensions
|
|||
|
||||
public void OnPointerExit(PointerEventData eventData)
|
||||
{
|
||||
if (!attachedSelectable.interactable)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
attachedSelectable.targetGraphic.CrossFadeColor(attachedSelectable.colors.normalColor, 0f, true, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,10 +40,6 @@ namespace UnityEngine.UI.Extensions
|
|||
bool updateLine = false;
|
||||
for (int i = 0; i < transforms.Length; i++)
|
||||
{
|
||||
if (transforms[i] == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!updateLine && previousPositions[i] != transforms[i].position)
|
||||
{
|
||||
updateLine = true;
|
||||
|
|
@ -64,10 +60,6 @@ namespace UnityEngine.UI.Extensions
|
|||
// First, convert the pivot to worldspace
|
||||
for (int i = 0; i < transforms.Length; i++)
|
||||
{
|
||||
if (transforms[i] == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
worldSpaces[i] = transforms[i].TransformPoint(thisPivot);
|
||||
}
|
||||
|
||||
|
|
@ -91,10 +83,6 @@ namespace UnityEngine.UI.Extensions
|
|||
previousPositions = new Vector3[transforms.Length];
|
||||
for (int i = 0; i < transforms.Length; i++)
|
||||
{
|
||||
if (transforms[i] == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
previousPositions[i] = transforms[i].position;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "com.unity.uiextensions",
|
||||
"displayName": "Unity UI Extensions",
|
||||
"version": "2.3.2",
|
||||
"version": "2.3.0",
|
||||
"description": "An extension project for the Unity3D UI system, all crafted and contributed by the awesome Unity community",
|
||||
"author": "Simon darkside Jackson <@SimonDarksideJ>",
|
||||
"contributors": [
|
||||
|
|
|
|||
Loading…
Reference in New Issue