Skip to content

Made property row labels flexible #604

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
May 27, 2020
Merged

Made property row labels flexible #604

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
64d3581
Made property row labels flexible
alelievr May 26, 2020
021e99d
Fixed indent level of propertyRow
alelievr May 26, 2020
f3cf3d5
Added more control to indent level and clear foldout
alelievr May 26, 2020
944c20a
Fix slight misalignment in fields
alelievr May 26, 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
1 change: 1 addition & 0 deletions com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ void RegisterActionToUndo(string actionName)
// Create foldout
var foldout = new Foldout() { text = targetName, value = foldoutActive, name = "foldout" };
element.Add(foldout);
foldout.AddToClassList("MainFoldout");
foldout.RegisterValueChangedCallback(evt =>
{
// Update foldout value and rebuild
Expand Down
28 changes: 13 additions & 15 deletions com.unity.shadergraph/Editor/Generation/Contexts/TargetPropertyGUIContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ namespace UnityEditor.ShaderGraph
[GenerationAPI]
internal class TargetPropertyGUIContext : VisualElement
{
const int kIndentWidthInPixel = 15;

public int globalIndentLevel {get; set;} = 0;

public TargetPropertyGUIContext()
{

Expand Down Expand Up @@ -43,29 +47,23 @@ public void AddProperty<T>(string label, int indentLevel, BaseField<T> field, Ev
notifyValueChanged.RegisterValueChangedCallback(evt);
}

string labelText = "";
for (var i = 0; i < indentLevel; i++)
{
labelText += " ";
}
labelText += label;

var propertyRow = new PropertyRow(new Label(labelText));
var propertyRow = new PropertyRow(new Label(label));
ApplyPadding(propertyRow, indentLevel);
propertyRow.Add(field);
this.hierarchy.Add(propertyRow);
}

public void AddLabel(string label, int indentLevel)
{
string labelText = "";
for (var i = 0; i < indentLevel; i++)
{
labelText += " ";
}
labelText += label;

var propertyRow = new PropertyRow(new Label(labelText));
var propertyRow = new PropertyRow(new Label(label));
ApplyPadding(propertyRow, indentLevel);
this.hierarchy.Add(propertyRow);
}

void ApplyPadding(PropertyRow row, int indentLevel)
{
row.Q(className: "unity-label").style.marginLeft = (globalIndentLevel + indentLevel) * kIndentWidthInPixel;
}
}
}
11 changes: 6 additions & 5 deletions com.unity.shadergraph/Editor/Resources/Styles/InspectorView.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
.unity-label {
padding: 5px 2px 2px;
margin: 2px 4px;
}

.InspectorView {
position:absolute;
justify-content: flex-start;
Expand Down Expand Up @@ -65,3 +60,9 @@
font-size: 11px;
color: #606060;
}

.MainFoldout {
background-color: #383838;
border-color: #1F1F1F;
border-top-width: 1px;
}
2 changes: 2 additions & 0 deletions com.unity.shadergraph/Editor/Resources/Styles/PropertyRow.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ PropertyRow > #container{
}

PropertyRow > #container > #label {
flex-grow: 5;
min-width: 92px;
width: 92px;
font-size: 12px;
margin-right: 4px;
Expand Down