Skip to content

Commit dacb384

Browse files
authored
Merge pull request #7071 from keveleigh/move-some-summaries
Move AppBar summaries to be inline with the properties instead of the fields
2 parents 6b7fbaf + 31d0605 commit dacb384

File tree

1 file changed

+87
-65
lines changed
  • Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar

1 file changed

+87
-65
lines changed

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBar.cs

Lines changed: 87 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -47,74 +47,81 @@ public enum AppBarStateEnum
4747
#region Private Serialized Fields with Public Properties
4848

4949
[Header("Target Bounding Box")]
50-
/// <summary>
51-
/// The bounding box this AppBar will use for its placement and control for manipulation
52-
/// </summary>
50+
5351
[Tooltip("The bounding box this AppBar will use for its placement and control for manipulation")]
5452
[SerializeField]
5553
private BoundingBox boundingBox = null;
5654

55+
/// <summary>
56+
/// The bounding box this AppBar will use for its placement and control for manipulation
57+
/// </summary>
5758
public BoundingBox TargetBoundingBox
5859
{
5960
get { return boundingBox; }
6061
set { boundingBox = value; }
6162
}
6263

63-
/// <summary>
64-
/// The parent game object for the renderable objects in the AppBar
65-
/// </summary>
6664
[Tooltip("The parent game object for the renderable objects in the app bar")]
6765
[SerializeField]
6866
private GameObject baseRenderer = null;
67+
68+
/// <summary>
69+
/// The parent game object for the renderable objects in the AppBar
70+
/// </summary>
6971
public GameObject BaseRenderer
7072
{
7173
get => baseRenderer;
7274
set => baseRenderer = value;
7375
}
7476

75-
/// <summary>
76-
/// The parent transform for the button collection
77-
/// </summary>
7877
[Tooltip("The parent transform for the button collection")]
7978
[SerializeField]
8079
private Transform buttonParent = null;
80+
81+
/// <summary>
82+
/// The parent transform for the button collection
83+
/// </summary>
8184
public Transform ButtonParent
8285
{
8386
get => buttonParent;
8487
set => buttonParent = value;
8588
}
8689

87-
/// <summary>
88-
/// The background gameobject, scales to fill area behind buttons
89-
/// </summary>
9090
[Tooltip("The background gameobject, scales to fill area behind buttons")]
9191
[SerializeField]
9292
private GameObject backgroundBar = null;
93+
94+
/// <summary>
95+
/// The background gameobject, scales to fill area behind buttons
96+
/// </summary>
9397
public GameObject BackgroundBar
9498
{
9599
get => backgroundBar;
96100
set => backgroundBar = value;
97101
}
98102

99103
[Header("States")]
100-
/// <summary>
101-
/// The AppBar's display type, default is Manipulation
102-
/// </summary>
103-
[Tooltip("The AppBar's display type, default is Manipulation")]
104+
105+
[Tooltip("The AppBar's display type; default is Manipulation")]
104106
[SerializeField]
105107
private AppBarDisplayTypeEnum displayType = AppBarDisplayTypeEnum.Manipulation;
108+
109+
/// <summary>
110+
/// The AppBar's display type; default is Manipulation
111+
/// </summary>
106112
public AppBarDisplayTypeEnum DisplayType
107113
{
108114
get { return displayType; }
109115
set { displayType = value; }
110116
}
111117

112-
/// <summary>
113-
/// The AppBar's current state
114-
/// </summary>
115118
[Tooltip("The AppBar's current state")]
116119
[SerializeField]
117120
private AppBarStateEnum state = AppBarStateEnum.Default;
121+
122+
/// <summary>
123+
/// The AppBar's current state
124+
/// </summary>
118125
public AppBarStateEnum State
119126
{
120127
get { return state; }
@@ -123,161 +130,176 @@ public AppBarStateEnum State
123130

124131

125132
[Header("Default Button Options")]
126-
/// <summary>
127-
/// Should the AppBar have a Remove button
128-
/// </summary>
129-
[Tooltip("Should the AppBar have a Remove button")]
133+
134+
[Tooltip("Should the AppBar have a remove button")]
130135
[SerializeField]
131136
private bool useRemove = true;
137+
138+
/// <summary>
139+
/// Should the AppBar have a remove button
140+
/// </summary>
132141
public bool UseRemove
133142
{
134143
get { return useRemove; }
135144
set { useRemove = value; }
136145
}
137146

138-
/// <summary>
139-
/// Should the AppBar have an Adjust button
140-
/// </summary>
141-
[Tooltip("Should the AppBar have an Adjust button")]
147+
[Tooltip("Should the AppBar have an adjust button")]
142148
[SerializeField]
143149
private bool useAdjust = true;
150+
151+
/// <summary>
152+
/// Should the AppBar have an adjust button
153+
/// </summary>
144154
public bool UseAdjust
145155
{
146156
get { return useAdjust; }
147157
set { useAdjust = value; }
148158
}
149159

150-
/// <summary>
151-
/// Should the AppBar have a Hide button
152-
/// </summary>
153-
[Tooltip("Should the AppBar have a Hide button")]
160+
[Tooltip("Should the AppBar have a hide button")]
154161
[SerializeField]
155162
private bool useHide = true;
163+
164+
/// <summary>
165+
/// Should the AppBar have a hide button
166+
/// </summary>
156167
public bool UseHide
157168
{
158169
get { return useHide; }
159170
set { useHide = value; }
160171
}
161172

162173
[Header("Default Button Icons")]
163-
/// <summary>
164-
/// The Adjust button texture
165-
/// </summary>
166-
[Tooltip("The Adjust button texture")]
174+
175+
[Tooltip("The adjust button texture")]
167176
[SerializeField]
168177
private Texture adjustIcon = null;
178+
179+
/// <summary>
180+
/// The adjust button texture
181+
/// </summary>
169182
public Texture AdjustIcon
170183
{
171184
get => adjustIcon;
172185
set => adjustIcon = value;
173186
}
174187

175-
/// <summary>
176-
/// The Done button texture
177-
/// </summary>
178-
[Tooltip("The Done button texture")]
188+
[Tooltip("The done button texture")]
179189
[SerializeField]
180190
private Texture doneIcon = null;
191+
192+
/// <summary>
193+
/// The done button texture
194+
/// </summary>
181195
public Texture DoneIcon
182196
{
183197
get => doneIcon;
184198
set => doneIcon = value;
185199
}
186200

187-
/// <summary>
188-
/// The Hide button texture
189-
/// </summary>
190-
[Tooltip("The Hide button texture")]
201+
[Tooltip("The hide button texture")]
191202
[SerializeField]
192203
private Texture hideIcon = null;
204+
205+
/// <summary>
206+
/// The hide button texture
207+
/// </summary>
193208
public Texture HideIcon
194209
{
195210
get => hideIcon;
196211
set => hideIcon = value;
197212
}
198213

199-
/// <summary>
200-
/// The Remove button texture
201-
/// </summary>
202214
[Tooltip("The Remove button texture")]
203215
[SerializeField]
204216
private Texture removeIcon = null;
217+
218+
/// <summary>
219+
/// The remove button texture
220+
/// </summary>
205221
public Texture RemoveIcon
206222
{
207223
get => removeIcon;
208224
set => removeIcon = value;
209225
}
210226

211-
/// <summary>
212-
/// The Show button texture
213-
/// </summary>
214-
[Tooltip("The Show button texture")]
227+
[Tooltip("The show button texture")]
215228
[SerializeField]
216229
private Texture showIcon = null;
230+
231+
/// <summary>
232+
/// The show button texture
233+
/// </summary>
217234
public Texture ShowIcon
218235
{
219236
get => showIcon;
220237
set => showIcon = value;
221238
}
222239

223240
[Header("Scale & Position Options")]
224-
/// <summary>
225-
/// Uses an alternate follow style that works better for very oblong objects
226-
/// </summary>
241+
227242
[SerializeField]
228243
[Tooltip("Uses an alternate follow style that works better for very oblong objects.")]
229244
private bool useTightFollow = false;
245+
246+
/// <summary>
247+
/// Uses an alternate follow style that works better for very oblong objects
248+
/// </summary>
230249
public bool UseTightFollow
231250
{
232251
get { return useTightFollow; }
233252
set { useTightFollow = value; }
234253
}
235254

255+
[SerializeField]
256+
[Tooltip("Where to display the app bar on the y axis. This can be set to negative values to force the app bar to appear below the object.")]
257+
private float hoverOffsetYScale = 0.25f;
258+
236259
/// <summary>
237260
/// Where to display the app bar on the y axis
238261
/// This can be set to negative values
239262
/// to force the app bar to appear below the object
240263
/// </summary>
241-
[SerializeField]
242-
[Tooltip("Where to display the app bar on the y axis. This can be set to negative values to force the app bar to appear below the object.")]
243-
private float hoverOffsetYScale = 0.25f;
244264
public float HoverOffsetYScale
245265
{
246266
get { return hoverOffsetYScale; }
247267
set { hoverOffsetYScale = value; }
248268
}
249269

250-
/// <summary>
251-
/// Pushes the app bar away from the object
252-
/// </summary>
253270
[SerializeField]
254271
[Tooltip("Pushes the app bar away from the object.")]
255272
private float hoverOffsetZ = 0f;
273+
274+
/// <summary>
275+
/// Pushes the app bar away from the object
276+
/// </summary>
256277
public float HoverOffsetZ
257278
{
258279
get { return hoverOffsetZ; }
259280
set { hoverOffsetZ = value; }
260281
}
261282

283+
[Tooltip("The button width for each button")]
284+
[SerializeField]
285+
private float buttonWidth = 0.032f;
262286

263287
/// <summary>
264288
/// The button width for each button
265289
/// </summary>
266-
[Tooltip("The button width for each button")]
267-
[SerializeField]
268-
private float buttonWidth = 0.032f;
269290
public float ButtonWidth
270291
{
271292
get => buttonWidth;
272293
set => buttonWidth = value;
273294
}
274295

275-
/// <summary>
276-
/// The button depth for each button
277-
/// </summary>
278296
[Tooltip("The button depth for each button")]
279297
[SerializeField]
280298
private float buttonDepth = 0.016f;
299+
300+
/// <summary>
301+
/// The button depth for each button
302+
/// </summary>
281303
public float ButtonDepth
282304
{
283305
get => buttonDepth;

0 commit comments

Comments
 (0)