@@ -223,7 +223,7 @@ public void Initialize(Type registeredType, ReadOnlyArray<NamedValue> existingPa
223223 m_ParameterEditor = null ;
224224
225225 // Create parameter labels.
226- m_ParameterLabels = new Tuple < string , string > [ m_Parameters . Length ] ;
226+ m_ParameterLabels = new ( string text , string tooltip ) [ m_Parameters . Length ] ;
227227 for ( var i = 0 ; i < m_Parameters . Length ; ++ i )
228228 {
229229 // Look up tooltip from field.
@@ -235,7 +235,7 @@ public void Initialize(Type registeredType, ReadOnlyArray<NamedValue> existingPa
235235
236236 // Create label.
237237 var niceName = ObjectNames . NicifyVariableName ( m_Parameters [ i ] . value . name ) ;
238- m_ParameterLabels [ i ] = new Tuple < string , string > ( niceName , tooltip ) ;
238+ m_ParameterLabels [ i ] = ( niceName , tooltip ) ;
239239 }
240240 }
241241 }
@@ -282,9 +282,9 @@ void OnEditEnd()
282282 if ( selectedIndex < 0 || selectedIndex >= names . Count )
283283 selectedIndex = 0 ;
284284
285- var field = new DropdownField ( label . Item1 , names , selectedIndex )
285+ var field = new DropdownField ( label . text , names , selectedIndex )
286286 {
287- tooltip = label . Item2
287+ tooltip = label . tooltip
288288 } ;
289289
290290 field . RegisterValueChangedCallback ( evt =>
@@ -301,39 +301,39 @@ void OnEditEnd()
301301 else if ( parameter . value . type == TypeCode . Int64 || parameter . value . type == TypeCode . UInt64 )
302302 {
303303 var longValue = parameter . value . value . ToInt64 ( ) ;
304- var field = new LongField ( label . Item1 ) { value = longValue , tooltip = label . Item2 } ;
304+ var field = new LongField ( label . text ) { value = longValue , tooltip = label . tooltip } ;
305305 field . RegisterValueChangedCallback ( evt => OnValueChanged ( ref parameter , evt . newValue , closedIndex ) ) ;
306306 field . RegisterCallback < BlurEvent > ( _ => OnEditEnd ( ) ) ;
307307 root . Add ( field ) ;
308308 }
309309 else if ( parameter . value . type . IsInt ( ) )
310310 {
311311 var intValue = parameter . value . value . ToInt32 ( ) ;
312- var field = new IntegerField ( label . Item1 ) { value = intValue , tooltip = label . Item2 } ;
312+ var field = new IntegerField ( label . text ) { value = intValue , tooltip = label . tooltip } ;
313313 field . RegisterValueChangedCallback ( evt => OnValueChanged ( ref parameter , evt . newValue , closedIndex ) ) ;
314314 field . RegisterCallback < BlurEvent > ( _ => OnEditEnd ( ) ) ;
315315 root . Add ( field ) ;
316316 }
317317 else if ( parameter . value . type == TypeCode . Single )
318318 {
319319 var floatValue = parameter . value . value . ToSingle ( ) ;
320- var field = new FloatField ( label . Item1 ) { value = floatValue , tooltip = label . Item2 } ;
320+ var field = new FloatField ( label . text ) { value = floatValue , tooltip = label . tooltip } ;
321321 field . RegisterValueChangedCallback ( evt => OnValueChanged ( ref parameter , evt . newValue , closedIndex ) ) ;
322322 field . RegisterCallback < BlurEvent > ( _ => OnEditEnd ( ) ) ;
323323 root . Add ( field ) ;
324324 }
325325 else if ( parameter . value . type == TypeCode . Double )
326326 {
327327 var floatValue = parameter . value . value . ToDouble ( ) ;
328- var field = new DoubleField ( label . Item1 ) { value = floatValue , tooltip = label . Item2 } ;
328+ var field = new DoubleField ( label . text ) { value = floatValue , tooltip = label . tooltip } ;
329329 field . RegisterValueChangedCallback ( evt => OnValueChanged ( ref parameter , evt . newValue , closedIndex ) ) ;
330330 field . RegisterCallback < BlurEvent > ( _ => OnEditEnd ( ) ) ;
331331 root . Add ( field ) ;
332332 }
333333 else if ( parameter . value . type == TypeCode . Boolean )
334334 {
335335 var boolValue = parameter . value . value . ToBoolean ( ) ;
336- var field = new Toggle ( label . Item1 ) { value = boolValue , tooltip = label . Item2 } ;
336+ var field = new Toggle ( label . text ) { value = boolValue , tooltip = label . tooltip } ;
337337 field . RegisterValueChangedCallback ( evt => OnValueChanged ( ref parameter , evt . newValue , closedIndex ) ) ;
338338 field . RegisterValueChangedCallback ( _ => OnEditEnd ( ) ) ;
339339 root . Add ( field ) ;
@@ -382,8 +382,7 @@ private void ReadParameterValuesFrom(object target)
382382 private InputParameterEditor m_ParameterEditor ;
383383 private EditableParameterValue [ ] m_Parameters ;
384384
385- // .Item1 is text, .Item2 is tooltip
386- private Tuple < string , string > [ ] m_ParameterLabels ;
385+ private ( string text , string tooltip ) [ ] m_ParameterLabels ;
387386
388387 private struct EditableParameterValue
389388 {
0 commit comments