Skip to content

Commit d6e6249

Browse files
authored
fix: Add tooltips for Render Streaming Settings in Project Settings Window (#937)
1 parent 6538f64 commit d6e6249

File tree

7 files changed

+22
-10
lines changed

7 files changed

+22
-10
lines changed

com.unity.renderstreaming/Editor/PropertyDrawers/SignalingSettingsDrawer.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ PopupField<string> CreatePopUpSignalingType(SerializedProperty property, string
4343
var settings = fieldInfo.GetValue(property.serializedObject.targetObject) as SignalingSettings;
4444
var defaultValue = CustomSignalingSettingsEditor.FindLabelByInspectedType(settings.GetType());
4545
var choices = CustomSignalingSettingsEditor.Labels().ToList();
46-
return new PopupField<string>(label: label, choices: choices, defaultValue: defaultValue);
46+
var field = new PopupField<string>(label: label, choices: choices, defaultValue: defaultValue);
47+
field.tooltip = "Choose the signaling type. \"WebSocket\" or \"HTTP Polling\".";
48+
return field;
4749
}
4850

4951
static void ReplaceVisualElement(VisualElement oldValue, VisualElement newValue)

com.unity.renderstreaming/Editor/RenderStreamingProjectSettingsProvider.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ internal class RenderStreamingProjectSettingsProvider : SettingsProvider
2020
private int currentSelectedSettingsAsset;
2121
private RenderStreamingSettings settings;
2222

23+
const string LabelRenderStreamingSettingsAsset = "Render Streaming Settings Asset";
24+
const string LabelCreateSettingsButton = "Create New Settings Asset";
25+
2326
const string kSettingsPath = "Project/Render Streaming";
2427
const string kTemplatePath = "Packages/com.unity.renderstreaming/Editor/UXML/RenderStreamingProjectSettings.uxml";
2528
const string kStylePath = "Packages/com.unity.renderstreaming/Editor/Styles/RenderStreamingProjectSettings.uss";
@@ -59,10 +62,11 @@ public override void OnActivate(string searchContext, VisualElement rootElement)
5962

6063
var defaultIndex = ArrayHelpers.IndexOf(availableRenderStreamingSettingsAssets, AssetDatabase.GetAssetPath(settings));
6164
var choices = availableRenderStreamingSettingsAssets.ToList();
62-
var selectPopup = new PopupField<string>(label: label, choices: choices, defaultIndex: defaultIndex)
65+
var selectPopup = new PopupField<string>(label: LabelRenderStreamingSettingsAsset, choices: choices, defaultIndex: defaultIndex)
6366
{
6467
name = "renderStreamingSettingsSelectPopup"
6568
};
69+
selectPopup.tooltip = "Choose the Render Streaming Settings.";
6670
selectPopup.RegisterValueChangedCallback(evt =>
6771
{
6872
currentSelectedSettingsAsset = selectPopup.index;
@@ -77,7 +81,7 @@ public override void OnActivate(string searchContext, VisualElement rootElement)
7781
});
7882
selectorContainer.Add(selectPopup);
7983

80-
var createSettingsButton = new Button { text = "Create New Settings Asset" };
84+
var createSettingsButton = new Button { text = LabelCreateSettingsButton };
8185
createSettingsButton.clicked += () =>
8286
{
8387
CreateNewSettingsAsset();

com.unity.renderstreaming/Editor/SignalingManagerEditor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ PopupField<SignalingSettingsObject> CreatePopUpSignalingType(SerializedProperty
9292
var paths = GetAvailableSignalingSettingsPath();
9393

9494
var field = new PopupField<SignalingSettingsObject>(label: label);
95+
field.tooltip = "Choose the signaling settings.";
9596
field.formatSelectedValueCallback = v => AssetDatabase.GetAssetPath(v);
9697
field.formatListItemCallback = v => AssetDatabase.GetAssetPath(v);
9798
if (paths.Length == 0)

com.unity.renderstreaming/Runtime/Scripts/RenderStreamingSettings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public class RenderStreamingSettings : ScriptableObject
1313
/// <summary>
1414
///
1515
/// </summary>
16-
[SerializeField] public bool automaticStreaming;
16+
[SerializeField, Tooltip("Automatically performs the necessary setup for streaming and starts streaming.")]
17+
public bool automaticStreaming;
1718

1819
[SerializeReference, SignalingSettings]
1920
public SignalingSettings signalingSettings = new WebSocketSignalingSettings();

com.unity.renderstreaming/Runtime/Scripts/Signaling/HttpSignalingSettings.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public class HttpSignalingSettings : SignalingSettings
2929
/// </summary>
3030
public int interval => m_interval;
3131

32-
[SerializeField]
32+
[SerializeField, Tooltip("Set the polling frequency (in milliseconds) to the signaling server.")]
3333
private int m_interval;
34-
[SerializeField]
34+
[SerializeField, Tooltip("Set the signaling server URL. you should specify a URL starting with \"http\" or \"https\".")]
3535
protected string m_url;
36-
[SerializeField]
36+
[SerializeField, Tooltip("Set a list of STUN/TURN servers.")]
3737
protected IceServer[] m_iceServers;
3838

3939
/// <summary>

com.unity.renderstreaming/Runtime/Scripts/Signaling/WebSocketSignalingSettings.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ public class WebSocketSignalingSettings : SignalingSettings
2727
/// </summary>
2828
public string url => m_url;
2929

30-
[SerializeField]
30+
[SerializeField, Tooltip("Set the signaling server URL. you should specify a URL starting with \"ws\" or \"wss\".")]
3131
protected string m_url;
32-
[SerializeField]
32+
33+
[SerializeField, Tooltip("Set a list of STUN/TURN servers.")]
3334
protected IceServer[] m_iceServers;
3435

3536
/// <summary>

com.unity.renderstreaming/Runtime/Scripts/SignalingManager.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public sealed class SignalingManager : MonoBehaviour
2424
internal const string EvaluateCommandlineArgumentsPropertyName = nameof(evaluateCommandlineArguments);
2525

2626
#pragma warning disable 0649
27-
[SerializeField]
27+
[SerializeField, Tooltip("Use settings in Project Settings Window.")]
2828
private bool m_useDefault = true;
2929

3030
[SerializeField]
@@ -54,6 +54,9 @@ public sealed class SignalingManager : MonoBehaviour
5454
private SignalingEventProvider m_provider;
5555
private bool m_running;
5656

57+
/// <summary>
58+
///
59+
/// </summary>
5760
public bool Running => m_running;
5861

5962
static ISignaling CreateSignaling(SignalingSettings settings, SynchronizationContext context)

0 commit comments

Comments
 (0)