Skip to content

Added context options "Move to Top", "Move to Bottom", "Expand All" and "Collapse All" for volume components. #2071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 3, 2020
Merged

Added context options "Move to Top", "Move to Bottom", "Expand All" and "Collapse All" for volume components. #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31c2643
Added context options "Move to Top", "Move to Bottom", "Expand All" a…
anisunity Oct 1, 2020
600ecf5
Fixing the expansion state after moving
anisunity Oct 2, 2020
9be41a6
Update CHANGELOG.md
sebastienlagarde Oct 3, 2020
a856bbd
Update CHANGELOG.md
sebastienlagarde Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [10.1.0] - 2019-08-04

Version Updated
The version number for this package has increased due to a version update of a related graphics package.
### Added
- Added context options "Move to Top", "Move to Bottom", "Expand All" and "Collapse All" for volume components.

### Fixed
- Fixed the scene view to scale correctly when hardware dynamic resolution is enabled (case 1158661)
Expand Down
48 changes: 48 additions & 0 deletions com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,30 @@ void OnContextClick(Vector2 position, VolumeComponent targetComponent, int id)
var menu = new GenericMenu();

if (id == 0)
{
menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Move Up"));
menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Move to Top"));
}
else
{
menu.AddItem(EditorGUIUtility.TrTextContent("Move to Top"), false, () => MoveComponent(id, -id));
menu.AddItem(EditorGUIUtility.TrTextContent("Move Up"), false, () => MoveComponent(id, -1));
}

if (id == m_Editors.Count - 1)
{
menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Move to Bottom"));
menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Move Down"));
}
else
{
menu.AddItem(EditorGUIUtility.TrTextContent("Move to Bottom"), false, () => MoveComponent(id, (m_Editors.Count -1) - id));
menu.AddItem(EditorGUIUtility.TrTextContent("Move Down"), false, () => MoveComponent(id, 1));
}

menu.AddSeparator(string.Empty);
menu.AddItem(EditorGUIUtility.TrTextContent("Collapse All"), false, () => CollapseComponents());
menu.AddItem(EditorGUIUtility.TrTextContent("Expand All"), false, () => ExpandComponents());
menu.AddSeparator(string.Empty);
menu.AddItem(EditorGUIUtility.TrTextContent("Reset"), false, () => ResetComponent(targetComponent.GetType(), id));
menu.AddItem(EditorGUIUtility.TrTextContent("Remove"), false, () => RemoveComponent(id));
Expand Down Expand Up @@ -419,11 +434,44 @@ internal void MoveComponent(int id, int offset)
m_ComponentsProperty.MoveArrayElement(id, id + offset);
m_SerializedObject.ApplyModifiedProperties();

// We need to keep track of what was expanded before to set it afterwards.
bool targetExpanded = m_Editors[id + offset].baseProperty.isExpanded;
bool sourceExpanded = m_Editors[id].baseProperty.isExpanded;

// Move editors
var prev = m_Editors[id + offset];
m_Editors[id + offset] = m_Editors[id];
m_Editors[id] = prev;

// Set the expansion values
m_Editors[id + offset].baseProperty.isExpanded = targetExpanded;
m_Editors[id].baseProperty.isExpanded = sourceExpanded;
}

internal void CollapseComponents()
{
// Move components
m_SerializedObject.Update();
int numEditors = m_Editors.Count;
for (int i = 0; i < numEditors; ++i)
{
m_Editors[i].baseProperty.isExpanded = false;
}
m_SerializedObject.ApplyModifiedProperties();
}

internal void ExpandComponents()
{
// Move components
m_SerializedObject.Update();
int numEditors = m_Editors.Count;
for (int i = 0; i < numEditors; ++i)
{
m_Editors[i].baseProperty.isExpanded = true;
}
m_SerializedObject.ApplyModifiedProperties();
}


static bool CanPaste(VolumeComponent targetComponent)
{
Expand Down