Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts: # Flax.flaxproj
This commit is contained in:
@@ -46,6 +46,11 @@ namespace FlaxEngine
|
||||
/// </summary>
|
||||
public bool CanReorderItems = true;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets whether items can be added or removed from this collection.
|
||||
/// </summary>
|
||||
public bool CanResize = true;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets whether the items of this collection can be null. If <c>true</c>, applications using this collection should prevent user to add null items to the collection.
|
||||
/// </summary>
|
||||
|
||||
@@ -23,11 +23,14 @@ namespace FlaxEngine
|
||||
public int FontSize;
|
||||
|
||||
/// <summary>
|
||||
/// The custom header color (as 32-bit uint).
|
||||
/// The custom header color (as 32-bit uint in RGB order, bottom bits contain Blue).
|
||||
/// </summary>
|
||||
public uint Color;
|
||||
|
||||
private HeaderAttribute()
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="HeaderAttribute"/> class.
|
||||
/// </summary>
|
||||
public HeaderAttribute()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
|
||||
namespace FlaxEngine;
|
||||
|
||||
@@ -15,7 +15,7 @@ public class WatermarkAttribute : Attribute
|
||||
public string WatermarkText;
|
||||
|
||||
/// <summary>
|
||||
/// The watermark color.
|
||||
/// The watermark color (as 32-bit uint in RGB order, bottom bits contain Blue).
|
||||
/// </summary>
|
||||
public uint WatermarkColor;
|
||||
|
||||
@@ -26,7 +26,7 @@ public class WatermarkAttribute : Attribute
|
||||
public WatermarkAttribute(string text)
|
||||
{
|
||||
WatermarkText = text;
|
||||
WatermarkColor = 0; // default color of watermark in textbox
|
||||
WatermarkColor = 0; // Default color of watermark in textbox
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user