Browse Source

Experimental Searchable menus are now enabled by default

master
desktop-maesty/steve 5 years ago
parent
commit
016e42d36d
  1. 10
      Assets/Fungus/Scripts/Editor/FungusEditorPreferences.cs
  2. 2
      Assets/Fungus/Scripts/Editor/PopupContent/CommandSelectorPopupWindowContent.cs
  3. 2
      Assets/Fungus/Scripts/Editor/PopupContent/EventSelectorPopupWindowContent.cs
  4. 2
      Assets/Fungus/Scripts/Editor/PopupContent/VariableSelectPopupWindowContent.cs

10
Assets/Fungus/Scripts/Editor/FungusEditorPreferences.cs

@ -17,10 +17,10 @@ namespace Fungus
// Have we loaded the prefs yet // Have we loaded the prefs yet
private static bool prefsLoaded = false; private static bool prefsLoaded = false;
const string HIDE_MUSH_KEY = "hideMushroomInHierarchy"; const string HIDE_MUSH_KEY = "hideMushroomInHierarchy";
const string USE_EXP_MENUS = "useExperimentalMenus"; const string USE_LEGACY_MENUS = "useLegacyMenus";
public static bool hideMushroomInHierarchy; public static bool hideMushroomInHierarchy;
public static bool useExperimentalMenus; public static bool useLegacyMenus;
static FungusEditorPreferences() static FungusEditorPreferences()
{ {
@ -45,13 +45,13 @@ namespace Fungus
// Preferences GUI // Preferences GUI
hideMushroomInHierarchy = EditorGUILayout.Toggle("Hide Mushroom Flowchart Icon", hideMushroomInHierarchy); hideMushroomInHierarchy = EditorGUILayout.Toggle("Hide Mushroom Flowchart Icon", hideMushroomInHierarchy);
useExperimentalMenus = EditorGUILayout.Toggle(new GUIContent("Experimental Searchable Menus", "Experimental menus replace the Event, Add Variable and Add Command menus with a searchable menu more like the Unity AddComponent menu."), useExperimentalMenus); useLegacyMenus = EditorGUILayout.Toggle(new GUIContent("Legacy Menus", "Force Legacy menus for Event, Add Variable and Add Command menus"), useLegacyMenus);
// Save the preferences // Save the preferences
if (GUI.changed) if (GUI.changed)
{ {
EditorPrefs.SetBool(HIDE_MUSH_KEY, hideMushroomInHierarchy); EditorPrefs.SetBool(HIDE_MUSH_KEY, hideMushroomInHierarchy);
EditorPrefs.SetBool(USE_EXP_MENUS, useExperimentalMenus); EditorPrefs.SetBool(USE_LEGACY_MENUS, useLegacyMenus);
} }
}, },
@ -65,7 +65,7 @@ namespace Fungus
public static void LoadOnScriptLoad() public static void LoadOnScriptLoad()
{ {
hideMushroomInHierarchy = EditorPrefs.GetBool(HIDE_MUSH_KEY, false); hideMushroomInHierarchy = EditorPrefs.GetBool(HIDE_MUSH_KEY, false);
useExperimentalMenus = EditorPrefs.GetBool(USE_EXP_MENUS, false); useLegacyMenus = EditorPrefs.GetBool(USE_LEGACY_MENUS, false);
prefsLoaded = true; prefsLoaded = true;
} }
} }

2
Assets/Fungus/Scripts/Editor/PopupContent/CommandSelectorPopupWindowContent.cs

@ -65,7 +65,7 @@ namespace Fungus.EditorUtils
curBlock = block; curBlock = block;
if (FungusEditorPreferences.useExperimentalMenus) if (!FungusEditorPreferences.useLegacyMenus)
{ {
var win = new CommandSelectorPopupWindowContent(currentHandlerName, var win = new CommandSelectorPopupWindowContent(currentHandlerName,
width, (int)(height - EditorGUIUtility.singleLineHeight * 3)); width, (int)(height - EditorGUIUtility.singleLineHeight * 3));

2
Assets/Fungus/Scripts/Editor/PopupContent/EventSelectorPopupWindowContent.cs

@ -77,7 +77,7 @@ namespace Fungus.EditorUtils
static public void DoEventHandlerPopUp(Rect position, string currentHandlerName, Block block, int width, int height) static public void DoEventHandlerPopUp(Rect position, string currentHandlerName, Block block, int width, int height)
{ {
if (FungusEditorPreferences.useExperimentalMenus) if (!FungusEditorPreferences.useLegacyMenus)
{ {
//new method //new method
EventSelectorPopupWindowContent win = new EventSelectorPopupWindowContent(currentHandlerName, block, width, height); EventSelectorPopupWindowContent win = new EventSelectorPopupWindowContent(currentHandlerName, block, width, height);

2
Assets/Fungus/Scripts/Editor/PopupContent/VariableSelectPopupWindowContent.cs

@ -61,7 +61,7 @@ namespace Fungus.EditorUtils
static public void DoAddVariable(Rect position, string currentHandlerName, Flowchart flowchart) static public void DoAddVariable(Rect position, string currentHandlerName, Flowchart flowchart)
{ {
curFlowchart = flowchart; curFlowchart = flowchart;
if (FungusEditorPreferences.useExperimentalMenus) if (!FungusEditorPreferences.useLegacyMenus)
{ {
//new method //new method
VariableSelectPopupWindowContent win = new VariableSelectPopupWindowContent(currentHandlerName, POPUP_WIDTH, POPUP_HEIGHT); VariableSelectPopupWindowContent win = new VariableSelectPopupWindowContent(currentHandlerName, POPUP_WIDTH, POPUP_HEIGHT);

Loading…
Cancel
Save