Skip to content

Commit ae54397

Browse files
committed
Better prefab override hadling for "Popup Visibility" log filter
1 parent ee25278 commit ae54397

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

Plugins/IngameDebugConsole/Editor/DebugLogManagerEditor.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,21 @@ public override void OnInspectorGUI()
119119
{
120120
EditorGUI.indentLevel++;
121121
#if UNITY_2017_3_OR_NEWER
122-
popupVisibilityLogFilter.intValue = (int) (DebugLogFilter) EditorGUILayout.EnumFlagsField( popupVisibilityLogFilterLabel, (DebugLogFilter) popupVisibilityLogFilter.intValue );
122+
Rect rect = EditorGUILayout.GetControlRect();
123+
EditorGUI.BeginProperty( rect, GUIContent.none, popupVisibilityLogFilter );
124+
popupVisibilityLogFilter.intValue = (int) (DebugLogFilter) EditorGUI.EnumFlagsField( rect, popupVisibilityLogFilterLabel, (DebugLogFilter) popupVisibilityLogFilter.intValue );
123125
#else
126+
EditorGUI.BeginProperty( new Rect(), GUIContent.none, popupVisibilityLogFilter );
124127
EditorGUI.BeginChangeCheck();
128+
125129
bool infoLog = EditorGUILayout.Toggle( "Info", ( (DebugLogFilter) popupVisibilityLogFilter.intValue & DebugLogFilter.Info ) == DebugLogFilter.Info );
126130
bool warningLog = EditorGUILayout.Toggle( "Warning", ( (DebugLogFilter) popupVisibilityLogFilter.intValue & DebugLogFilter.Warning ) == DebugLogFilter.Warning );
127131
bool errorLog = EditorGUILayout.Toggle( "Error", ( (DebugLogFilter) popupVisibilityLogFilter.intValue & DebugLogFilter.Error ) == DebugLogFilter.Error );
132+
128133
if( EditorGUI.EndChangeCheck() )
129134
popupVisibilityLogFilter.intValue = ( infoLog ? (int) DebugLogFilter.Info : 0 ) | ( warningLog ? (int) DebugLogFilter.Warning : 0 ) | ( errorLog ? (int) DebugLogFilter.Error : 0 );
130135
#endif
136+
EditorGUI.EndProperty();
131137
EditorGUI.indentLevel--;
132138
}
133139

0 commit comments

Comments
 (0)