foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-22 17:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

整理代码

Browse Source
This commit is contained in:
monitor1394
2019-06-21 09:34:33 +08:00
parent 3dab004731
commit fc95338274
34 changed files with 64 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/Editor/BaseChartEditor.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using UnityEditor;
using UnityEditor;
using UnityEngine;
namespace XCharts
@@ -33,8 +32,8 @@ namespace XCharts
private bool m_ThemeModuleToggle = false;
private bool m_BaseModuleToggle = false;
protected virtual void OnEnable()
{
@@ -75,7 +74,7 @@ namespace XCharts
{
EditorGUILayout.PropertyField(m_Script);
EditorGUILayout.BeginHorizontal();
EditorGUIUtility.fieldWidth = EditorGUIUtility.labelWidth -5;
EditorGUIUtility.fieldWidth = EditorGUIUtility.labelWidth - 5;
m_ThemeModuleToggle = EditorGUILayout.Foldout(m_ThemeModuleToggle, "Theme",
ChartEditorHelper.foldoutStyle);
EditorGUILayout.PropertyField(m_Theme, GUIContent.none);
@@ -93,7 +92,7 @@ namespace XCharts
protected virtual void OnMiddleInspectorGUI()
{
EditorGUILayout.PropertyField(m_Series,true);
EditorGUILayout.PropertyField(m_Series, true);
m_BaseModuleToggle = EditorGUILayout.Foldout(m_BaseModuleToggle, "Base",
ChartEditorHelper.foldoutStyle);
if (m_BaseModuleToggle)

10
Scripts/Editor/PropertyDrawers/AxisDrawer.cs
View File

@@ -1,7 +1,6 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -107,7 +106,7 @@ namespace XCharts
EditorGUI.PropertyField(drawRect, m_AxisTick);
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
drawRect.y += EditorGUI.GetPropertyHeight(m_AxisTick);
if (type == Axis.AxisType.Category)
{
drawRect.width = EditorGUIUtility.labelWidth + 10;
@@ -154,11 +153,12 @@ namespace XCharts
{
height += EditorGUIUtility.singleLineHeight * 3 + EditorGUIUtility.standardVerticalSpacing;
}
}else if(type == Axis.AxisType.Value)
}
else if (type == Axis.AxisType.Value)
{
height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
SerializedProperty m_MinMaxType = prop.FindPropertyRelative("m_MinMaxType");
if(m_MinMaxType.enumValueIndex == (int)Axis.AxisMinMaxType.Custom)
if (m_MinMaxType.enumValueIndex == (int)Axis.AxisMinMaxType.Custom)
{
height += EditorGUIUtility.singleLineHeight * 2 + EditorGUIUtility.standardVerticalSpacing;
}
@@ -166,7 +166,7 @@ namespace XCharts
height += EditorGUI.GetPropertyHeight(m_AxisTick);
return height;
}
}
}
}

1
Scripts/Editor/PropertyDrawers/AxisTickDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

1
Scripts/Editor/PropertyDrawers/BarDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

3
Scripts/Editor/PropertyDrawers/CoordinateDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -22,7 +21,7 @@ namespace XCharts
SerializedProperty m_FontSize = prop.FindPropertyRelative("m_FontSize");
ChartEditorHelper.MakeFoldout(ref drawRect, ref m_CoordinateModuleToggle, "Coordinate");
EditorGUI.LabelField(drawRect, "Coordinate",EditorStyles.boldLabel);
EditorGUI.LabelField(drawRect, "Coordinate", EditorStyles.boldLabel);
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
if (m_CoordinateModuleToggle)
{

1
Scripts/Editor/PropertyDrawers/DataZoomDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

3
Scripts/Editor/PropertyDrawers/LegendDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -63,7 +62,7 @@ namespace XCharts
SerializedProperty location = prop.FindPropertyRelative("m_Location");
height += 5 * EditorGUIUtility.singleLineHeight + 4 * EditorGUIUtility.standardVerticalSpacing;
height += EditorGUI.GetPropertyHeight(location);
height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
if (m_DataFoldout)
{
SerializedProperty m_Data = prop.FindPropertyRelative("m_Data");

3
Scripts/Editor/PropertyDrawers/LineDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -49,7 +48,7 @@ namespace XCharts
if (m_Point.boolValue)
{
drawRect.x = EditorGUIUtility.labelWidth + 15;
EditorGUI.LabelField(drawRect,"Width");
EditorGUI.LabelField(drawRect, "Width");
drawRect.x = EditorGUIUtility.labelWidth + 65;
float tempWidth = EditorGUIUtility.currentViewWidth - EditorGUIUtility.labelWidth - 70;
if (tempWidth < 20) tempWidth = 20;

1
Scripts/Editor/PropertyDrawers/LocationDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

1
Scripts/Editor/PropertyDrawers/PieDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

13
Scripts/Editor/PropertyDrawers/RadarDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -63,13 +62,13 @@ namespace XCharts
if (m_RadarModuleToggle)
{
++EditorGUI.indentLevel;
EditorGUIUtility.fieldWidth = 10;
EditorGUIUtility.labelWidth = 50;
drawRect.width = 60;
EditorGUI.PropertyField(drawRect, m_Cricle);
EditorGUIUtility.labelWidth = 45;
drawRect.x += 60;
EditorGUI.PropertyField(drawRect, m_Area);
@@ -129,7 +128,7 @@ namespace XCharts
if (m_RadarModuleToggle)
{
propNum += 13;
if (m_BackgroundColorToggle)
{
m_BackgroundColorList = prop.FindPropertyRelative("m_BackgroundColorList");
@@ -139,14 +138,14 @@ namespace XCharts
if (m_IndicatorJsonAreaToggle) propNum += 4;
float height = propNum * EditorGUIUtility.singleLineHeight + (propNum -1) * EditorGUIUtility.standardVerticalSpacing;
float height = propNum * EditorGUIUtility.singleLineHeight + (propNum - 1) * EditorGUIUtility.standardVerticalSpacing;
if (m_IndicatorToggle)
{
m_IndicatorList = prop.FindPropertyRelative("m_IndicatorList");
height += EditorGUIUtility.singleLineHeight * 2 + EditorGUIUtility.standardVerticalSpacing;
for(int i = 0; i < m_IndicatorSize; i++)
for (int i = 0; i < m_IndicatorSize; i++)
{
height += EditorGUI.GetPropertyHeight(m_IndicatorList.GetArrayElementAtIndex(i));
}

7
Scripts/Editor/PropertyDrawers/RadarIndicatorDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -31,12 +30,12 @@ namespace XCharts
if (m_RadarModuleToggle)
{
++EditorGUI.indentLevel;
EditorGUI.PropertyField(drawRect, m_Name);
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
EditorGUI.PropertyField(drawRect, m_Max);
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
--EditorGUI.indentLevel;
}
}
@@ -47,7 +46,7 @@ namespace XCharts
if (m_RadarModuleToggle)
{
propNum += 2;
return propNum * EditorGUIUtility.singleLineHeight + (propNum -1) * EditorGUIUtility.standardVerticalSpacing;
return propNum * EditorGUIUtility.singleLineHeight + (propNum - 1) * EditorGUIUtility.standardVerticalSpacing;
}
else
{

1
Scripts/Editor/PropertyDrawers/SerieDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

4
Scripts/Editor/PropertyDrawers/SeriesDrawer.cs
View File

@@ -1,7 +1,5 @@
using System.Collections.Generic;
using UnityEditor;
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

1
Scripts/Editor/PropertyDrawers/ThemeInfoDrawer.cs
View File

@@ -1,7 +1,6 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

1
Scripts/Editor/PropertyDrawers/TitleDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{

3
Scripts/Editor/PropertyDrawers/TooltipDrawer.cs
View File

@@ -1,6 +1,5 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
@@ -27,7 +26,7 @@ namespace XCharts
public override float GetPropertyHeight(SerializedProperty prop, GUIContent label)
{
if(m_TooltipModuleToggle)
if (m_TooltipModuleToggle)
return 2 * (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing);
else
return 1 * (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing);