addresing the requested changes in #1586

WEKIT-ECS · Oct 5, 2023 · f960191 · f960191
1 parent c99ab03
commit f960191
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Assets/MirageXR/Player/Resources/Prefabs/UI/Mobile/Content/ContentEditors/GlyphEditor.prefab b/Assets/MirageXR/Player/Resources/Prefabs/UI/Mobile/Content/ContentEditors/GlyphEditor.prefab
@@ -461,8 +461,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 1014d33ff99a6dc4a80586accd0ae5c6, type: 2}
   - {fileID: 11400000, guid: e43a67ae9828b254592eba4cd1f1cc4f, type: 2}
   _accept: {fileID: 8566574427742946681}
-  _acceptBtnOb: {fileID: 8566574427742946683}
-  _closeBtnOb: {fileID: 3539490645316945413}
+  _acceptButtonObject: {fileID: 8566574427742946683}
+  _closeButtonObject: {fileID: 3539490645316945413}
 --- !u!114 &8371701705238998908
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -893,7 +893,7 @@ PrefabInstance:
     - target: {fileID: 6588041167533423104, guid: 6c30edebc2ad75e4b9e3127da5e3b06b,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 260
+      value: 120
       objectReference: {fileID: 0}
     - target: {fileID: 6588041167533423104, guid: 6c30edebc2ad75e4b9e3127da5e3b06b,
         type: 3}
@@ -903,7 +903,7 @@ PrefabInstance:
     - target: {fileID: 6588041167533423104, guid: 6c30edebc2ad75e4b9e3127da5e3b06b,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 60
+      value: 200
       objectReference: {fileID: 0}
     - target: {fileID: 6588041167533423104, guid: 6c30edebc2ad75e4b9e3127da5e3b06b,
         type: 3}

diff --git a/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/GlyphEditorView.cs b/Assets/MirageXR/Player/Scripts/Mobile/ContentEditors/GlyphEditorView.cs
@@ -23,8 +23,8 @@ public class GlyphEditorView : PopupEditorBase
     [SerializeField] private ActionObject[] _actionObjects;
     [Space]
     [SerializeField] private Button _accept;
-    [SerializeField] private GameObject _acceptBtnOb;
-    [SerializeField] private GameObject _closeBtnOb;
+    [SerializeField] private GameObject _acceptButtonObject;
+    [SerializeField] private GameObject _closeButtonObject;
 
     private Trigger _trigger;
     private float _gazeDuration;
@@ -79,8 +79,8 @@ private void UpdateView()
 
         if (_content != null)
         {
-            _closeBtnOb.SetActive(false);
-            _acceptBtnOb.SetActive(true);
+            _closeButtonObject.SetActive(false);
+            _acceptButtonObject.SetActive(true);
 
             _trigger = _step.triggers.Find(tr => tr.id == _content.poi);
             if (_trigger != null)

diff --git a/Assets/MirageXR/Tests/NewUI/ContentListItem_v2.cs b/Assets/MirageXR/Tests/NewUI/ContentListItem_v2.cs
@@ -44,7 +44,7 @@ public void UpdateView(Content content)
 
         if (_type == ContentType.LABEL || _type == ContentType.PICKANDPLACE)
         {
-            _txtName.text = _type.GetName() + ": " + _content.text;
+            _txtName.text = $"{_type.GetName()}: {_content.text}";
         }
         else
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ public void UpdateView(Content content) @@
             if (_type == ContentType.LABEL || _type == ContentType.PICKANDPLACE)
             {
-                _txtName.text = _type.GetName() + ": " + _content.text;
+                _txtName.text = $"{_type.GetName()}: {_content.text}";
             }
             else
             {
@@ Expand Down @@