浏览代码

[FIX] # 288 Updated the ChannelEnum and ChannelEnumMask controls to use their own uss files. This solves the 5pixels extra width on the nodes using them.

/main
Martin Thorzen 6 年前
当前提交
57b10b82
共有 6 个文件被更改,包括 40 次插入0 次删除
  1. 1
      com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumControl.cs
  2. 1
      com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumMaskControl.cs
  3. 9
      com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss
  4. 10
      com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss.meta
  5. 9
      com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss
  6. 10
      com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss.meta

1
com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumControl.cs


public ChannelEnumControlView(string label, int slotId, AbstractMaterialNode node, PropertyInfo propertyInfo)
{
AddStyleSheetPath("Styles/Controls/ChannelEnumControlView");
m_Node = node;
m_PropertyInfo = propertyInfo;
m_SlotId = slotId;

1
com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumMaskControl.cs


public ChannelEnumMaskControlView(string label, int slotId, AbstractMaterialNode node, PropertyInfo propertyInfo)
{
AddStyleSheetPath("Styles/Controls/ChannelEnumMaskControlView");
m_Node = node;
m_PropertyInfo = propertyInfo;
m_SlotId = slotId;

9
com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss


ChannelEnumControlView {
flex-direction: row;
flex: 1;
padding-left: 8;
padding-right: 8;
padding-top: 4;
padding-bottom: 4;
width: 200;
}

10
com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss.meta


fileFormatVersion: 2
guid: 8dfac6eef2d89e8428c7a79b147413db
ScriptedImporter:
fileIDToRecycleName:
11400000: stylesheet
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}

9
com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss


ChannelEnumMaskControlView {
flex-direction: row;
flex: 1;
padding-left: 8;
padding-right: 8;
padding-top: 4;
padding-bottom: 4;
width: 200;
}

10
com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss.meta


fileFormatVersion: 2
guid: 1db7b9bf1f9186d44ba7fefd3bc715c6
ScriptedImporter:
fileIDToRecycleName:
11400000: stylesheet
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
正在加载...
取消
保存