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

修复Inspector下Foldout后的勾选框无法选中的问题

Browse Source
This commit is contained in:
monitor1394
2021-03-18 20:15:40 +08:00
parent 09c32f171d
commit e8a725fb05
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/XCharts/CHANGELOG-EN.md
View File

@@ -32,6 +32,8 @@
## Latest ## Latest
* (2021.03.18) Fixed an issue where the check box after `Foldout` in `Inspector` could not be checked
* (2021.03.18) Fixed an issue with `BarChart` displaying an exception in the `0` value
* (2021.03.14) Fixed `Tooltip` indicator was not indicating the correct location in some cases * (2021.03.14) Fixed `Tooltip` indicator was not indicating the correct location in some cases
* (2021.03.13) Optimized the editing experience and component refresh after `MulticomponentMode` is enabled #128 * (2021.03.13) Optimized the editing experience and component refresh after `MulticomponentMode` is enabled #128
* (2021.03.10) Added `CandlestickChart` #124 * (2021.03.10) Added `CandlestickChart` #124

3
Assets/XCharts/CHANGELOG.md
View File

@@ -32,7 +32,8 @@
## Latest ## Latest
* (2021.03.18) 修复`BarChart`在 `0` 数值时显示异常的问题 * (2021.03.18) 修复`Inspector`下`Foldout`后的勾选框无法选中的问题
* (2021.03.18) 修复`BarChart`在`0`数值时显示异常的问题
* (2021.03.14) 修复`Tooltip`的指示器在某些情况下指示位置不准的问题 * (2021.03.14) 修复`Tooltip`的指示器在某些情况下指示位置不准的问题
* (2021.03.13) 优化`MultiComponentMode`开启后的编辑体验和组件刷新 #128 * (2021.03.13) 优化`MultiComponentMode`开启后的编辑体验和组件刷新 #128
* (2021.03.10) 增加`CandlestickChart`K线图 #124 * (2021.03.10) 增加`CandlestickChart`K线图 #124

6
Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs
View File

@@ -212,7 +212,7 @@ namespace XCharts
SerializedProperty m_ShowDataIcon = prop.FindPropertyRelative("m_ShowDataIcon"); SerializedProperty m_ShowDataIcon = prop.FindPropertyRelative("m_ShowDataIcon");
int index = InitToggle(prop); int index = InitToggle(prop);
drawRect.width = EditorGUIUtility.labelWidth + 10; drawRect.width = EditorGUIUtility.labelWidth + 10;
m_DataFoldout[index] = EditorGUI.Foldout(drawRect, m_DataFoldout[index], "Data"); m_DataFoldout[index] = EditorGUI.Foldout(drawRect, m_DataFoldout[index], "Data", true);
drawRect.width = pos.width; drawRect.width = pos.width;
AddSingleLineHeight(); AddSingleLineHeight();
@@ -222,8 +222,8 @@ namespace XCharts
float nameWid = 45; float nameWid = 45;
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER
var gap = 2; var gap = 2;
var namegap = 3; var namegap = 3;
#else #else
var gap = 0; var gap = 0;
var namegap = 0; var namegap = 0;

9
Assets/XCharts/Editor/Utility/ChartEditorHelper.cs
View File

@@ -142,7 +142,7 @@ public class ChartEditorHelper
float defaultX = drawRect.x; float defaultX = drawRect.x;
var style = bold ? Styles.foldoutStyle : EditorStyles.foldout; var style = bold ? Styles.foldoutStyle : EditorStyles.foldout;
drawRect.width = EditorGUIUtility.labelWidth - EditorGUI.indentLevel * INDENT_WIDTH; drawRect.width = EditorGUIUtility.labelWidth - EditorGUI.indentLevel * INDENT_WIDTH;
moduleToggle = EditorGUI.Foldout(drawRect, moduleToggle, content, style); moduleToggle = EditorGUI.Foldout(drawRect, moduleToggle, content, true, style);
MakeBool(drawRect, prop); MakeBool(drawRect, prop);
drawRect.width = defaultWidth; drawRect.width = defaultWidth;
drawRect.x = defaultX; drawRect.x = defaultX;
@@ -156,7 +156,7 @@ public class ChartEditorHelper
float defaultX = drawRect.x; float defaultX = drawRect.x;
var style = bold ? Styles.foldoutStyle : EditorStyles.foldout; var style = bold ? Styles.foldoutStyle : EditorStyles.foldout;
drawRect.width = EditorGUIUtility.labelWidth; drawRect.width = EditorGUIUtility.labelWidth;
moduleToggle[key] = EditorGUI.Foldout(drawRect, moduleToggle[key], content, style); moduleToggle[key] = EditorGUI.Foldout(drawRect, moduleToggle[key], content, true, style);
if (prop != null) if (prop != null)
{ {
if (prop.propertyType == SerializedPropertyType.Boolean) if (prop.propertyType == SerializedPropertyType.Boolean)
@@ -236,7 +236,8 @@ public class ChartEditorHelper
drawRect.width = EditorGUIUtility.labelWidth; drawRect.width = EditorGUIUtility.labelWidth;
#endif #endif
var displayName = string.IsNullOrEmpty(moduleName) ? prop.displayName : moduleName; var displayName = string.IsNullOrEmpty(moduleName) ? prop.displayName : moduleName;
toggle = EditorGUI.Foldout(drawRect, toggle, displayName, bold ? Styles.foldoutStyle : EditorStyles.foldout); var foldoutStyle = bold ? Styles.foldoutStyle : EditorStyles.foldout;
toggle = EditorGUI.Foldout(drawRect, toggle, displayName, true, foldoutStyle);
if (moduleToggle[key] != toggle) if (moduleToggle[key] != toggle)
{ {
@@ -276,7 +277,7 @@ public class ChartEditorHelper
{ {
var rawWidth = drawRect.width; var rawWidth = drawRect.width;
drawRect.width = EditorGUIUtility.labelWidth + 10; drawRect.width = EditorGUIUtility.labelWidth + 10;
bool flag = EditorGUI.Foldout(drawRect, foldout, listProp.displayName); bool flag = EditorGUI.Foldout(drawRect, foldout, listProp.displayName, true);
height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
drawRect.width = rawWidth; drawRect.width = rawWidth;