Merge pull request #67 from mixer/issue-63

Small fix for Label

Author: payzer

Source/InteractiveSDK/Assets/MixerInteractive/Source/Editor/InteractiveSettingsWindow.cs

@@ -43,11 +43,6 @@ public class InteractiveSettingsWindow : EditorWindow
     private static bool wasPaused;
     private static bool initialized;
 
-    // Control indexes
-    private static int CONTROL_DROPDOWN_BUTTON_INDEX = 0;
-    private static int CONTROL_JOYSTICK_BUTTON_INDEX = 1;
-
-    private static string[] controlOptions;
     private static string[] logLevelOptions;
     private bool existingProjectInformation;
 
@@ -81,11 +76,6 @@ void Initialize()
         titleContent = new GUIContent("Interactive Editor");
         EditorStyles.textArea.wordWrap = true;
 
-        controlOptions = new string[]
-           {
-                "Button", "Joystick"
-           };
-
         logLevelOptions = new string[]
            {
                 "none", "minimal", "verbose"

Source/InteractiveSDK/Assets/MixerInteractive/Source/Scripts/InteractiveLabelControl.cs

@@ -59,7 +59,7 @@ public void SetText(string text)
                 text);
         }
 
-        public InteractiveLabelControl(string controlID, InteractiveEventType type, string text, string sceneID) : base(controlID, InteractivityManager.CONTROL_TYPE_BUTTON, type, false, "", "", sceneID)
+        public InteractiveLabelControl(string controlID, string text, string sceneID) : base(controlID, InteractivityManager.CONTROL_KIND_LABEL, InteractiveEventType.Unknown, false, "", "", sceneID)
         {
             Text = text;
         }

Source/InteractiveSDK/Assets/MixerInteractive/Source/Scripts/InteractivityManager.cs

@@ -2122,7 +2122,7 @@ private InteractiveControl ReadControl(JsonReader jsonReader, string sceneID = "
             string controlID = string.Empty;
             uint cost = 0;
             bool disabled = false;
-            string helpText = string.Empty;
+            string text = string.Empty;
             string eTag = string.Empty;
             string kind = string.Empty;
             try
@@ -2144,7 +2144,7 @@ private InteractiveControl ReadControl(JsonReader jsonReader, string sceneID = "
                                 break;
                             case WS_MESSAGE_KEY_TEXT:
                                 jsonReader.Read();
-                                helpText = jsonReader.Value.ToString();
+                                text = jsonReader.Value.ToString();
                                 break;
                             case WS_MESSAGE_KEY_ETAG:
                                 jsonReader.Read();
@@ -2171,19 +2171,23 @@ private InteractiveControl ReadControl(JsonReader jsonReader, string sceneID = "
             }
             if (kind == WS_MESSAGE_VALUE_CONTROL_TYPE_BUTTON)
             {
-                newControl = new InteractiveButtonControl(controlID, InteractiveEventType.Button, disabled, helpText, cost, eTag, sceneID);
+                newControl = new InteractiveButtonControl(controlID, InteractiveEventType.Button, disabled, text, cost, eTag, sceneID);
             }
             else if (kind == WS_MESSAGE_VALUE_CONTROL_TYPE_JOYSTICK)
             {
-                newControl = new InteractiveJoystickControl(controlID, InteractiveEventType.Joystick, disabled, helpText, eTag, sceneID);
+                newControl = new InteractiveJoystickControl(controlID, InteractiveEventType.Joystick, disabled, text, eTag, sceneID);
             }
             else if (kind == WS_MESSAGE_VALUE_CONTROL_TYPE_TEXTBOX)
             {
-                newControl = new InteractiveTextControl(controlID, InteractiveEventType.TextInput, disabled, helpText, eTag, sceneID);
+                newControl = new InteractiveTextControl(controlID, InteractiveEventType.TextInput, disabled, text, eTag, sceneID);
+            }
+            else if (kind == WS_MESSAGE_VALUE_CONTROL_TYPE_LABEL)
+            {
+                newControl = new InteractiveLabelControl(controlID, text, sceneID);
             }
             else
             {
-                newControl = new InteractiveControl(controlID, kind, InteractiveEventType.Unknown, disabled, helpText, eTag, sceneID);
+                newControl = new InteractiveControl(controlID, kind, InteractiveEventType.Unknown, disabled, text, eTag, sceneID);
             }
             return newControl;
         }
@@ -3424,6 +3428,7 @@ private void SendJsonString(string jsonString)
         internal const string WS_MESSAGE_VALUE_DEFAULT_GROUP_ID = "default";
         internal const string WS_MESSAGE_VALUE_DEFAULT_SCENE_ID = "default";
         private const string WS_MESSAGE_VALUE_CONTROL_TYPE_JOYSTICK = "joystick";
+        internal const string WS_MESSAGE_VALUE_CONTROL_TYPE_LABEL = "label";
         internal const string WS_MESSAGE_VALUE_CONTROL_TYPE_TEXTBOX = "textbox";
         private const bool WS_MESSAGE_VALUE_TRUE = true;
 
@@ -3467,6 +3472,7 @@ private void SendJsonString(string jsonString)
         // Input
         internal const string CONTROL_TYPE_BUTTON = "button";
         internal const string CONTROL_TYPE_JOYSTICK = "joystick";
+        internal const string CONTROL_KIND_LABEL = "label";
         internal const string CONTROL_KIND_TEXTBOX = "textbox";
 
         // Event names