Skip to content

Commit 95487ca

Browse files
committed
Bug fix - changing toggle dwell button prefab to unintented override for toggle behavior. Moved debug text position for improved visibility.
1 parent d32f50a commit 95487ca

File tree

2 files changed

+15
-55
lines changed

2 files changed

+15
-55
lines changed

Assets/MRTK/Examples/Demos/UX/Dwell/DwellExample.unity

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2695,8 +2695,8 @@ Transform:
26952695
m_PrefabAsset: {fileID: 0}
26962696
m_GameObject: {fileID: 1130710042}
26972697
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2698-
m_LocalPosition: {x: -0.24998188, y: -36.3, z: 0.50002337}
2699-
m_LocalScale: {x: 385.71356, y: 473.82272, z: 26.5}
2698+
m_LocalPosition: {x: -0.24998188, y: -47.07, z: 0.50002337}
2699+
m_LocalScale: {x: 385.71356, y: 495.35706, z: 26.5}
27002700
m_Children: []
27012701
m_Father: {fileID: 2022692052}
27022702
m_RootOrder: 5
@@ -5906,7 +5906,7 @@ RectTransform:
59065906
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
59075907
m_AnchorMin: {x: 0.5, y: 0.5}
59085908
m_AnchorMax: {x: 0.5, y: 0.5}
5909-
m_AnchoredPosition: {x: -1.5, y: -332.69998}
5909+
m_AnchoredPosition: {x: 19, y: -32}
59105910
m_SizeDelta: {x: 381.79288, y: 79.57269}
59115911
m_Pivot: {x: 0.5, y: 0.5}
59125912
--- !u!114 &1749119427
@@ -5992,7 +5992,7 @@ MonoBehaviour:
59925992
m_VertexBufferAutoSizeReduction: 1
59935993
m_useMaxVisibleDescender: 1
59945994
m_pageToDisplay: 1
5995-
m_margin: {x: 0, y: 0, z: 0, w: 0}
5995+
m_margin: {x: 0, y: 0, z: 39.361298, w: 56.077457}
59965996
m_isUsingLegacyAnimationComponent: 0
59975997
m_isVolumetricText: 0
59985998
m_hasFontAssetChanged: 0
@@ -6252,7 +6252,7 @@ RectTransform:
62526252
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
62536253
m_AnchorMin: {x: 0, y: 0.5}
62546254
m_AnchorMax: {x: 0, y: 0.5}
6255-
m_AnchoredPosition: {x: 27.100006, y: -104}
6255+
m_AnchoredPosition: {x: 27.100006, y: -127.6}
62566256
m_SizeDelta: {x: 229, y: 150}
62576257
m_Pivot: {x: 0, y: 0.5}
62586258
--- !u!114 &1980267454

Assets/MRTK/SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2ToggleDwell.prefab

Lines changed: 10 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,11 @@ PrefabInstance:
175175
m_Modification:
176176
m_TransformParent: {fileID: 0}
177177
m_Modifications:
178+
- target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237,
179+
type: 3}
180+
propertyPath: m_TextStyleHashCode
181+
value: -1183493901
182+
objectReference: {fileID: 0}
178183
- target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237,
179184
type: 3}
180185
propertyPath: m_textInfo.lineCount
@@ -205,56 +210,6 @@ PrefabInstance:
205210
propertyPath: m_Materials.Array.data[0]
206211
value:
207212
objectReference: {fileID: 2100000, guid: ec72a3a105768f746b556a8dfdae61a8, type: 2}
208-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
209-
type: 3}
210-
propertyPath: m_Enabled
211-
value: 1
212-
objectReference: {fileID: 0}
213-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
214-
type: 3}
215-
propertyPath: Dimensions
216-
value: 1
217-
objectReference: {fileID: 0}
218-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
219-
type: 3}
220-
propertyPath: VoiceCommand
221-
value:
222-
objectReference: {fileID: 0}
223-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
224-
type: 3}
225-
propertyPath: profiles.Array.data[0].Themes.Array.size
226-
value: 1
227-
objectReference: {fileID: 0}
228-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
229-
type: 3}
230-
propertyPath: profiles.Array.data[1].Themes.Array.size
231-
value: 1
232-
objectReference: {fileID: 0}
233-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
234-
type: 3}
235-
propertyPath: profiles.Array.data[2].Themes.Array.size
236-
value: 1
237-
objectReference: {fileID: 0}
238-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
239-
type: 3}
240-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
241-
value: 2
242-
objectReference: {fileID: 0}
243-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
244-
type: 3}
245-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
246-
value:
247-
objectReference: {fileID: 0}
248-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
249-
type: 3}
250-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
251-
value:
252-
objectReference: {fileID: 8300000, guid: 06f9d598e90313646bbff63530142344, type: 3}
253-
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
254-
type: 3}
255-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
256-
value: UnityEngine.AudioClip, UnityEngine
257-
objectReference: {fileID: 0}
258213
- target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
259214
type: 3}
260215
propertyPath: m_RootOrder
@@ -340,6 +295,11 @@ PrefabInstance:
340295
propertyPath: m_text
341296
value: Toggle Dwell
342297
objectReference: {fileID: 0}
298+
- target: {fileID: 6742094791873819759, guid: 64790b91b91094d49942373c4e83c237,
299+
type: 3}
300+
propertyPath: m_TextStyleHashCode
301+
value: -1183493901
302+
objectReference: {fileID: 0}
343303
- target: {fileID: 6742094791873819759, guid: 64790b91b91094d49942373c4e83c237,
344304
type: 3}
345305
propertyPath: m_textInfo.lineCount

0 commit comments

Comments
 (0)