zune/ZuneShell.dll
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneShell.dll.git synced 2026-07-27 13:11:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "name can be simplified"

Browse Source
This commit is contained in:
Joshua Askharoun
2021-03-31 17:20:20 -05:00
parent 9b09412b45
commit 799fca8d97
384 changed files with 3966 additions and 3966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX/Microsoft/Iris/ViewItems/CountLayoutInput.cs
+2 -2
View File
@@ -22,9 +22,9 @@ namespace Microsoft.Iris.ViewItems
set => this._count = value;
}
DataCookie ILayoutInput.Data => CountLayoutInput.Data;
DataCookie ILayoutInput.Data => Data;
public static DataCookie Data => CountLayoutInput.s_dataProperty;
public static DataCookie Data => s_dataProperty;
public override string ToString() => InvariantString.Format("{0}(Count={1})", this.GetType().Name, _count);
}
UIX/Microsoft/Iris/ViewItems/Graphic.cs
+15 -15
View File
@@ -43,20 +43,20 @@ namespace Microsoft.Iris.ViewItems
public static void EnsureFallbackImages()
{
if (Graphic.s_AcquiringDefaultImage != null)
if (s_AcquiringDefaultImage != null)
return;
Graphic.s_AcquiringDefaultImage = new UriImage(Graphic.s_AcquiringDefaultImageUri, new Inset(3, 3, 53, 53), Size.Zero, false);
Graphic.s_AcquiringDefaultImage.Load();
Graphic.s_ErrorDefaultImage = new UriImage(Graphic.s_ErrorDefaultImageUri, new Inset(3, 3, 53, 53), Size.Zero, false);
Graphic.s_ErrorDefaultImage.Load();
s_AcquiringDefaultImage = new UriImage(s_AcquiringDefaultImageUri, new Inset(3, 3, 53, 53), Size.Zero, false);
s_AcquiringDefaultImage.Load();
s_ErrorDefaultImage = new UriImage(s_ErrorDefaultImageUri, new Inset(3, 3, 53, 53), Size.Zero, false);
s_ErrorDefaultImage.Load();
}
protected override void OnDispose()
{
this.ReleaseInUseImage(this._contentImage, null);
this.ReleaseInUseImage(this._preloadImage, null);
this.ReleaseInUseImage(this.AcquiringImage, Graphic.s_AcquiringDefaultImage);
this.ReleaseInUseImage(this.ErrorImage, Graphic.s_ErrorDefaultImage);
this.ReleaseInUseImage(this.AcquiringImage, s_AcquiringDefaultImage);
this.ReleaseInUseImage(this.ErrorImage, s_ErrorDefaultImage);
this._preloadImage = null;
this._contentImage = null;
this.AsyncLoadCompleteHandler = null;
@@ -97,14 +97,14 @@ namespace Microsoft.Iris.ViewItems
public UIImage AcquiringImage
{
get => this.GetStatusImage(Graphic.s_acquiringImageProperty, Graphic.s_AcquiringDefaultImage);
set => this.SetStatusImage(value, NotificationID.AcquiringImage, Graphic.s_acquiringImageProperty, Graphic.s_AcquiringDefaultImage);
get => this.GetStatusImage(s_acquiringImageProperty, s_AcquiringDefaultImage);
set => this.SetStatusImage(value, NotificationID.AcquiringImage, s_acquiringImageProperty, s_AcquiringDefaultImage);
}
public UIImage ErrorImage
{
get => this.GetStatusImage(Graphic.s_errorImageProperty, Graphic.s_ErrorDefaultImage);
set => this.SetStatusImage(value, NotificationID.ErrorImage, Graphic.s_errorImageProperty, Graphic.s_ErrorDefaultImage);
get => this.GetStatusImage(s_errorImageProperty, s_ErrorDefaultImage);
set => this.SetStatusImage(value, NotificationID.ErrorImage, s_errorImageProperty, s_ErrorDefaultImage);
}
public UIImage PreloadContent
@@ -125,7 +125,7 @@ namespace Microsoft.Iris.ViewItems
private UIImage GetStatusImage(DataCookie cookie, UIImage defaultImage)
{
object data = this.GetData(cookie);
return data != null ? (data != Graphic.s_NullImage ? (UIImage)data : null) : defaultImage;
return data != null ? (data != s_NullImage ? (UIImage)data : null) : defaultImage;
}
private void SetStatusImage(
@@ -147,7 +147,7 @@ namespace Microsoft.Iris.ViewItems
value.AddUser(this);
}
else
obj = Graphic.s_NullImage;
obj = s_NullImage;
this.ReleaseInUseImage(statusImage, defaultImage);
this.SetData(cookie, obj);
this.MarkPaintInvalid();
@@ -307,8 +307,8 @@ namespace Microsoft.Iris.ViewItems
private ContentLoadCompleteHandler AsyncLoadCompleteHandler
{
get => (ContentLoadCompleteHandler)this.GetData(Graphic.s_pendingLoadCompleteHandlerProperty);
set => this.SetData(Graphic.s_pendingLoadCompleteHandlerProperty, value);
get => (ContentLoadCompleteHandler)this.GetData(s_pendingLoadCompleteHandlerProperty);
set => this.SetData(s_pendingLoadCompleteHandlerProperty, value);
}
public void CommitPreload() => this.Content = this.PreloadContent;
UIX/Microsoft/Iris/ViewItems/Host.cs
+3 -3
View File
@@ -31,7 +31,7 @@ namespace Microsoft.Iris.ViewItems
private string _loadNotifyURI;
private HostRequestPacket _pendingHostRequest;
private uint _islandId;
private static DeferredHandler s_startRequestHandler = new DeferredHandler(Host.StartSourceRequest);
private static DeferredHandler s_startRequestHandler = new DeferredHandler(StartSourceRequest);
public Host()
: this(null, null)
@@ -109,7 +109,7 @@ namespace Microsoft.Iris.ViewItems
hostRequestPacket.Properties = properties;
this._pendingHostRequest = hostRequestPacket;
this._lastRequestedSource = source;
DeferredCall.Post(DispatchPriority.High, Host.s_startRequestHandler, hostRequestPacket);
DeferredCall.Post(DispatchPriority.High, s_startRequestHandler, hostRequestPacket);
}
public void Cancel()
@@ -139,7 +139,7 @@ namespace Microsoft.Iris.ViewItems
LoadResult loadResult = null;
string uiToCreate = null;
if (type == null && source != null)
loadResult = MarkupSystem.Load(Host.CrackSourceUri(source, out uiToCreate), host.InheritedIslandId);
loadResult = MarkupSystem.Load(CrackSourceUri(source, out uiToCreate), host.InheritedIslandId);
host.CompleteSourceRequest(source, type, properties, loadResult, uiToCreate);
}
finally
UIX/Microsoft/Iris/ViewItems/HwndHost.cs
+1 -1
View File
@@ -104,7 +104,7 @@ namespace Microsoft.Iris.ViewItems
return;
Vector3 parentOffsetPxlVector;
Vector3 scaleVector;
ViewItem.GetAccumulatedOffsetAndScale(this, null, out parentOffsetPxlVector, out scaleVector);
GetAccumulatedOffsetAndScale(this, null, out parentOffsetPxlVector, out scaleVector);
Vector2 visualSize = this.VisualSize;
this._window.ClientPosition = new Point((int)Math.Round(parentOffsetPxlVector.X), (int)Math.Round(parentOffsetPxlVector.Y));
this._window.WindowSize = new Size(Math2.RoundUp(scaleVector.X * visualSize.X), Math2.RoundUp(scaleVector.Y * visualSize.Y));
UIX/Microsoft/Iris/ViewItems/ImageLayout.cs
+1 -1
View File
@@ -53,7 +53,7 @@ namespace Microsoft.Iris.ViewItems
size = Size.Min(Size.Max(this._minimumSize, this._sourceExtent), constraint);
if (this._maintainAspectRatio && this._sourceExtent != Size.Zero && size != this._sourceExtent)
{
Size sz1 = ImageLayout.SmallestFillingFit(this._sourceExtent, size);
Size sz1 = SmallestFillingFit(this._sourceExtent, size);
if (sz1.Height > constraint.Height || sz1.Width > constraint.Width)
sz1 = Size.LargestFit(this._sourceExtent, constraint);
size = Size.Min(sz1, constraint);
UIX/Microsoft/Iris/ViewItems/IndexLayoutInput.cs
+2 -2
View File
@@ -25,9 +25,9 @@ namespace Microsoft.Iris.ViewItems
public IndexType Type => this._type;
DataCookie ILayoutInput.Data => IndexLayoutInput.Data;
DataCookie ILayoutInput.Data => Data;
public static DataCookie Data => IndexLayoutInput.s_dataProperty;
public static DataCookie Data => s_dataProperty;
public override string ToString() => InvariantString.Format("{0}(Index={1}, Type={2})", this.GetType().Name, Index, _type);
}
UIX/Microsoft/Iris/ViewItems/Repeater.cs
+20 -20
View File
@@ -42,15 +42,15 @@ namespace Microsoft.Iris.ViewItems
private ViewItem _lastMouseFocusedItem;
private RepeaterContentSelector _contentSelector;
private LayoutCompleteEventHandler _repeatedItemLayoutComplete;
private static ChildFaultedInDelegate s_scrollIndexIntoViewHandler = new ChildFaultedInDelegate(Repeater.ScrollIndexIntoViewItemFaultedIn);
private static ChildFaultedInDelegate s_navigateIntoIndexHandler = new ChildFaultedInDelegate(Repeater.NavigateIntoIndexItemFaultedIn);
private static ChildFaultedInDelegate s_scrollIndexIntoViewHandler = new ChildFaultedInDelegate(ScrollIndexIntoViewItemFaultedIn);
private static ChildFaultedInDelegate s_navigateIntoIndexHandler = new ChildFaultedInDelegate(NavigateIntoIndexItemFaultedIn);
private static string[] s_repeatedItemParameters = new string[2]
{
"RepeatedItem",
"RepeatedItemIndex"
};
private static string c_childIDSentinel = "Repeater child#";
private static DeferredHandler s_listContentsChangedHandler = new DeferredHandler(Repeater.AsyncListContentsChangedHandler);
private static DeferredHandler s_listContentsChangedHandler = new DeferredHandler(AsyncListContentsChangedHandler);
private static object s_unavailableObject = new object();
protected override void OnDispose()
@@ -258,7 +258,7 @@ namespace Microsoft.Iris.ViewItems
}
else
{
if (Microsoft.Iris.Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, 5))
if (Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, 5))
{
int num = this._pendingIndexRequest.HasValue ? 1 : 0;
}
@@ -389,7 +389,7 @@ namespace Microsoft.Iris.ViewItems
int generationValue,
object dataItemObject)
{
if (dataItemObject == Repeater.UnavailableItem)
if (dataItemObject == UnavailableItem)
return;
bool flag = false;
IVirtualList source = null;
@@ -437,7 +437,7 @@ namespace Microsoft.Iris.ViewItems
out ViewItem repeatedItem,
out ViewItem dividerItem)
{
ParameterContext parameterContext = new ParameterContext(Repeater.s_repeatedItemParameters, new object[2]
ParameterContext parameterContext = new ParameterContext(s_repeatedItemParameters, new object[2]
{
dataItemObject,
index
@@ -641,7 +641,7 @@ namespace Microsoft.Iris.ViewItems
private void QueueListContentsChanged(IList senderList, UIListContentsChangedArgs args)
{
RepeaterListContentsChangedArgs contentsChangedArgs = new RepeaterListContentsChangedArgs(args, this, this._sourceGeneration);
DeferredCall.Post(DispatchPriority.Normal, Repeater.s_listContentsChangedHandler, contentsChangedArgs);
DeferredCall.Post(DispatchPriority.Normal, s_listContentsChangedHandler, contentsChangedArgs);
}
private static void AsyncListContentsChangedHandler(object args)
@@ -907,11 +907,11 @@ namespace Microsoft.Iris.ViewItems
int dataOldIndex,
int dataNewIndex)
{
Microsoft.Iris.Library.TreeNode.LinkType lt = Microsoft.Iris.Library.TreeNode.LinkType.Before;
Microsoft.Iris.Library.TreeNode.LinkType lt = LinkType.Before;
if (dataNewIndex > dataOldIndex)
lt = Microsoft.Iris.Library.TreeNode.LinkType.Behind;
lt = LinkType.Behind;
ViewItem viewItem = itemFinal.Repeated;
if (itemFinal.Divider != null && lt == Microsoft.Iris.Library.TreeNode.LinkType.Before)
if (itemFinal.Divider != null && lt == LinkType.Before)
viewItem = itemFinal.Divider;
item.Repeated.MoveNode(viewItem, lt);
if (this.DividerName != null)
@@ -933,12 +933,12 @@ namespace Microsoft.Iris.ViewItems
itemFinal.Divider = item.Divider;
item.Divider = null;
}
divider?.MoveNode(repeated, Microsoft.Iris.Library.TreeNode.LinkType.Before);
divider?.MoveNode(repeated, LinkType.Before);
}
return true;
}
protected override ViewItemID IDForChild(ViewItem childItem) => new ViewItemID((childItem.GetLayoutInput(IndexLayoutInput.Data) as IndexLayoutInput).Index.Value, Repeater.c_childIDSentinel);
protected override ViewItemID IDForChild(ViewItem childItem) => new ViewItemID((childItem.GetLayoutInput(IndexLayoutInput.Data) as IndexLayoutInput).Index.Value, c_childIDSentinel);
protected override FindChildResult ChildForID(
ViewItemID part,
@@ -946,7 +946,7 @@ namespace Microsoft.Iris.ViewItems
{
resultItem = null;
FindChildResult findChildResult = FindChildResult.Failure;
if (part.IDValid && part.StringPartValid && part.StringPart == Repeater.c_childIDSentinel)
if (part.IDValid && part.StringPartValid && part.StringPart == c_childIDSentinel)
{
resultItem = this.GetRepeatedItemForVirtualIndex(part.ID);
findChildResult = resultItem == null || !resultItem.HasVisual ? FindChildResult.PotentiallyFaultIn : FindChildResult.Success;
@@ -978,7 +978,7 @@ namespace Microsoft.Iris.ViewItems
if (itemForVirtualIndex != null)
itemForVirtualIndex.ScrollIntoView();
else
this.FaultInChild(index, Repeater.PendingIndexRequestType.ScrollIndexIntoView, Repeater.s_scrollIndexIntoViewHandler);
this.FaultInChild(index, PendingIndexRequestType.ScrollIndexIntoView, s_scrollIndexIntoViewHandler);
}
private static void ScrollIndexIntoViewItemFaultedIn(ViewItem repeater, ViewItem faultedItem)
@@ -1003,7 +1003,7 @@ namespace Microsoft.Iris.ViewItems
{
if (!allowFaultIn)
return;
this.FaultInChild(index, Repeater.PendingIndexRequestType.NavigateIntoIndex, Repeater.s_navigateIntoIndexHandler);
this.FaultInChild(index, PendingIndexRequestType.NavigateIntoIndex, s_navigateIntoIndexHandler);
}
}
@@ -1014,7 +1014,7 @@ namespace Microsoft.Iris.ViewItems
faultedItem.NavigateInto();
}
internal override void FaultInChild(ViewItemID child, ChildFaultedInDelegate handler) => this.FaultInChild(child.ID, Repeater.PendingIndexRequestType.FaultInChild, handler);
internal override void FaultInChild(ViewItemID child, ChildFaultedInDelegate handler) => this.FaultInChild(child.ID, PendingIndexRequestType.FaultInChild, handler);
private void FaultInChild(
int virtualIndex,
@@ -1041,13 +1041,13 @@ namespace Microsoft.Iris.ViewItems
[Conditional("DEBUG")]
private void DEBUG_DumpRepeatedItems(string st, byte level)
{
if (!Microsoft.Iris.Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, level))
if (!Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, level))
return;
for (int index = 0; index < this._repeatedViewItems.Count; ++index)
{
Repeater.RepeatedViewItemSet repeatedViewItem = this._repeatedViewItems[index];
}
if (!Microsoft.Iris.Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, (byte)(level + 1U)))
if (!Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, (byte)(level + 1U)))
return;
foreach (ViewItem child in this.Children)
;
@@ -1056,7 +1056,7 @@ namespace Microsoft.Iris.ViewItems
[Conditional("DEBUG")]
private void DEBUG_DumpRepeatedItem(Repeater.RepeatedViewItemSet item, byte level)
{
if (!Microsoft.Iris.Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, level) || !ListUtility.IsValidIndex(this._source, item.DataIndex))
if (!Debug.Trace.IsCategoryEnabled(TraceCategory.Repeating, level) || !ListUtility.IsValidIndex(this._source, item.DataIndex))
return;
this._source[item.DataIndex]?.ToString();
}
@@ -1076,7 +1076,7 @@ namespace Microsoft.Iris.ViewItems
num = list[index].VirtualIndex;
}
public static object UnavailableItem => Repeater.s_unavailableObject;
public static object UnavailableItem => s_unavailableObject;
public delegate void ContentTypeHandler(object repeatObject, ref string contentName);
UIX/Microsoft/Iris/ViewItems/Text.cs
+86 -86
View File
@@ -75,7 +75,7 @@ namespace Microsoft.Iris.ViewItems
public Text()
{
this.Layout = this;
this._font = Microsoft.Iris.ViewItems.Text.s_defaultFont;
this._font = s_defaultFont;
this._textColor = Color.Black;
this._textHighlightColor = Color.White;
this._backHighlightColor = Color.Black;
@@ -84,17 +84,17 @@ namespace Microsoft.Iris.ViewItems
this._maxLines = int.MaxValue;
this._passwordChar = '•';
this._lineAlignment = LineAlignment.Near;
this._richTextRasterizer = Microsoft.Iris.ViewItems.Text.SharedNonOversampledRasterizer;
this._richTextRasterizer = SharedNonOversampledRasterizer;
this._renderingHelper = new TextFlowRenderingHelper();
this.ContributesToWidth = true;
this.TextFitsWidth = true;
this.TextFitsHeight = true;
this.SetClipped(false);
this.MarkScaleDirty();
if (Microsoft.Iris.ViewItems.Text.s_simpleTextMeasureAvailable)
if (s_simpleTextMeasureAvailable)
return;
this.ClearBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasurePossible);
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasureValid);
this.ClearBit(Bits.FastMeasurePossible);
this.SetBit(Bits.FastMeasureValid);
}
public Text(UIClass ownerUI)
@@ -123,29 +123,29 @@ namespace Microsoft.Iris.ViewItems
public static void Uninitialize()
{
if (Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer != null)
if (s_sharedOversampledRasterizer != null)
{
Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer.Dispose();
Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer = null;
s_sharedOversampledRasterizer.Dispose();
s_sharedOversampledRasterizer = null;
}
if (Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer != null)
if (s_sharedNonOversampledRasterizer != null)
{
Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer.Dispose();
Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer = null;
s_sharedNonOversampledRasterizer.Dispose();
s_sharedNonOversampledRasterizer = null;
}
if (Microsoft.Iris.ViewItems.Text.s_sharedSimpleTextRasterizer == null)
if (s_sharedSimpleTextRasterizer == null)
return;
Microsoft.Iris.ViewItems.Text.s_sharedSimpleTextRasterizer.Dispose();
Microsoft.Iris.ViewItems.Text.s_sharedSimpleTextRasterizer = null;
s_sharedSimpleTextRasterizer.Dispose();
s_sharedSimpleTextRasterizer = null;
}
private static SimpleText SharedSimpleTextRasterizer
{
get
{
if (Microsoft.Iris.ViewItems.Text.s_sharedSimpleTextRasterizer == null)
Microsoft.Iris.ViewItems.Text.s_sharedSimpleTextRasterizer = new SimpleText();
return Microsoft.Iris.ViewItems.Text.s_sharedSimpleTextRasterizer;
if (s_sharedSimpleTextRasterizer == null)
s_sharedSimpleTextRasterizer = new SimpleText();
return s_sharedSimpleTextRasterizer;
}
}
@@ -153,13 +153,13 @@ namespace Microsoft.Iris.ViewItems
{
get
{
if (Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer == null)
if (s_sharedOversampledRasterizer == null)
{
Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer = new RichText(true);
Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer.Oversample = true;
Microsoft.Iris.ViewItems.Text.s_simpleTextMeasureAvailable = NativeApi.SpSimpleTextIsAvailable();
s_sharedOversampledRasterizer = new RichText(true);
s_sharedOversampledRasterizer.Oversample = true;
s_simpleTextMeasureAvailable = NativeApi.SpSimpleTextIsAvailable();
}
return Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer;
return s_sharedOversampledRasterizer;
}
}
@@ -167,12 +167,12 @@ namespace Microsoft.Iris.ViewItems
{
get
{
if (Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer == null)
if (s_sharedNonOversampledRasterizer == null)
{
Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer = new RichText(true);
Microsoft.Iris.ViewItems.Text.s_simpleTextMeasureAvailable = NativeApi.SpSimpleTextIsAvailable();
s_sharedNonOversampledRasterizer = new RichText(true);
s_simpleTextMeasureAvailable = NativeApi.SpSimpleTextIsAvailable();
}
return Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer;
return s_sharedNonOversampledRasterizer;
}
}
@@ -185,7 +185,7 @@ namespace Microsoft.Iris.ViewItems
return;
if (value != null && value.Length > 3)
{
this._content = value.TrimEnd(Microsoft.Iris.ViewItems.Text.s_whitespaceChars);
this._content = value.TrimEnd(s_whitespaceChars);
char ch1 = value[value.Length - 1];
char ch2 = value[value.Length - 2];
if (ch1 == ' ' && ch2 != ' ')
@@ -200,12 +200,12 @@ namespace Microsoft.Iris.ViewItems
}
}
public void MarkScaleDirty() => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.ScaleDirty);
public void MarkScaleDirty() => this.SetBit(Bits.ScaleDirty);
private bool InMeasure
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.InMeasure);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.InMeasure, value);
get => this.GetBit(Bits.InMeasure);
set => this.SetBit(Bits.InMeasure, value);
}
public void OnDisplayedContentChange()
@@ -297,10 +297,10 @@ namespace Microsoft.Iris.ViewItems
flag = true;
break;
}
if (this._richTextRasterizer == Microsoft.Iris.ViewItems.Text.s_sharedNonOversampledRasterizer && flag)
this._richTextRasterizer = Microsoft.Iris.ViewItems.Text.SharedOversampledRasterizer;
else if (this._richTextRasterizer == Microsoft.Iris.ViewItems.Text.s_sharedOversampledRasterizer && !flag)
this._richTextRasterizer = Microsoft.Iris.ViewItems.Text.SharedNonOversampledRasterizer;
if (this._richTextRasterizer == s_sharedNonOversampledRasterizer && flag)
this._richTextRasterizer = SharedOversampledRasterizer;
else if (this._richTextRasterizer == s_sharedOversampledRasterizer && !flag)
this._richTextRasterizer = SharedNonOversampledRasterizer;
else
this._richTextRasterizer.Oversample = flag;
this.MarkTextLayoutInvalid();
@@ -311,12 +311,12 @@ namespace Microsoft.Iris.ViewItems
public bool WordWrap
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.WordWrap);
get => this.GetBit(Bits.WordWrap);
set
{
if (this.WordWrap == value)
return;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.WordWrap, value);
this.SetBit(Bits.WordWrap, value);
if (value)
this.KeepFlowAlive = true;
this.MarkPaintInvalid();
@@ -328,12 +328,12 @@ namespace Microsoft.Iris.ViewItems
public bool UsePasswordMask
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.PasswordMasked);
get => this.GetBit(Bits.PasswordMasked);
set
{
if (this.UsePasswordMask == value)
return;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.PasswordMasked, value);
this.SetBit(Bits.PasswordMasked, value);
this.MarkPaintInvalid();
this.MarkTextLayoutInvalid();
this.FireNotification(NotificationID.UsePasswordMask);
@@ -387,13 +387,13 @@ namespace Microsoft.Iris.ViewItems
public float LineSpacing
{
get => !this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.LineSpacingSet) ? 0.0f : this._lineSpacing;
get => !this.GetBit(Bits.LineSpacingSet) ? 0.0f : this._lineSpacing;
set
{
if (LineSpacing == (double)value)
return;
this._lineSpacing = value;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.LineSpacingSet);
this.SetBit(Bits.LineSpacingSet);
this.MarkPaintInvalid();
this.MarkTextLayoutInvalid();
this.FireNotification(NotificationID.LineSpacing);
@@ -402,13 +402,13 @@ namespace Microsoft.Iris.ViewItems
public float CharacterSpacing
{
get => !this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.CharacterSpacingSet) ? 0.0f : this._characterSpacing;
get => !this.GetBit(Bits.CharacterSpacingSet) ? 0.0f : this._characterSpacing;
set
{
if (CharacterSpacing == (double)value)
return;
this._characterSpacing = value;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.CharacterSpacingSet);
this.SetBit(Bits.CharacterSpacingSet);
this.MarkPaintInvalid();
this.MarkTextLayoutInvalid();
this.FireNotification(NotificationID.CharacterSpacing);
@@ -417,13 +417,13 @@ namespace Microsoft.Iris.ViewItems
public bool EnableKerning
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.EnableKerningSet) && this._enableKerning;
get => this.GetBit(Bits.EnableKerningSet) && this._enableKerning;
set
{
if (this.EnableKerning == value)
return;
this._enableKerning = value;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.EnableKerningSet);
this.SetBit(Bits.EnableKerningSet);
this.MarkPaintInvalid();
this.MarkTextLayoutInvalid();
this.FireNotification(NotificationID.EnableKerning);
@@ -511,12 +511,12 @@ namespace Microsoft.Iris.ViewItems
public bool ContributesToWidth
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.ContributesToWidth);
get => this.GetBit(Bits.ContributesToWidth);
set
{
if (this.ContributesToWidth == value)
return;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.ContributesToWidth, value);
this.SetBit(Bits.ContributesToWidth, value);
this.FireNotification(NotificationID.ContributesToWidth);
this.MarkLayoutInvalid();
}
@@ -535,13 +535,13 @@ namespace Microsoft.Iris.ViewItems
}
}
public bool Clipped => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.Clipped);
public bool Clipped => this.GetBit(Bits.Clipped);
private void SetClipped(bool value)
{
if (this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.Clipped) == value)
if (this.GetBit(Bits.Clipped) == value)
return;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.Clipped, value);
this.SetBit(Bits.Clipped, value);
this.FireNotification(NotificationID.Clipped);
}
@@ -559,7 +559,7 @@ namespace Microsoft.Iris.ViewItems
this.MarkScaleDirty();
}
else
this._richTextRasterizer = !oversample ? Microsoft.Iris.ViewItems.Text.SharedNonOversampledRasterizer : Microsoft.Iris.ViewItems.Text.SharedOversampledRasterizer;
this._richTextRasterizer = !oversample ? SharedNonOversampledRasterizer : SharedOversampledRasterizer;
this.MarkTextLayoutInvalid();
}
}
@@ -584,7 +584,7 @@ namespace Microsoft.Iris.ViewItems
public ItemAlignment DefaultChildAlignment => ItemAlignment.Default;
public bool IsViewDependent(ViewItem node) => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.ViewDependent);
public bool IsViewDependent(ViewItem node) => this.GetBit(Bits.ViewDependent);
public void GetInitialChildrenRequests(out int more) => more = 0;
@@ -747,7 +747,7 @@ namespace Microsoft.Iris.ViewItems
}
}
this.KeepFlowAlive |= flag1;
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.ViewDependent, flag1);
this.SetBit(Bits.ViewDependent, flag1);
DefaultLayout.Arrange(layoutNode, slot);
}
@@ -771,7 +771,7 @@ namespace Microsoft.Iris.ViewItems
TextStyle effectiveTextStyle = this.GetEffectiveTextStyle();
Size constraint = new Size(boundingWidth, boundingHeight);
this.DisposeFlow();
this._flow = Microsoft.Iris.ViewItems.Text.SharedSimpleTextRasterizer.Measure(this._content, alignment, effectiveTextStyle, constraint);
this._flow = SharedSimpleTextRasterizer.Measure(this._content, alignment, effectiveTextStyle, constraint);
this._flow.DeclareOwner(this);
}
@@ -793,7 +793,7 @@ namespace Microsoft.Iris.ViewItems
if (this._parsedContent == null && content != null)
{
this._parsedContentMarkedRanges = new ArrayList();
this._parsedContent = Microsoft.Iris.ViewItems.Text.ParseMarkedUpText(content, this._parsedContentMarkedRanges);
this._parsedContent = ParseMarkedUpText(content, this._parsedContentMarkedRanges);
}
content = this._parsedContent;
}
@@ -807,9 +807,9 @@ namespace Microsoft.Iris.ViewItems
measureParams.SetFormat(alignment, effectiveTextStyle);
if ((this._boundsType & TextBounds.TrimLeftSideBearing) != TextBounds.Full && this._lineAlignment == LineAlignment.Near)
measureParams.TrimLeftSideBearing();
if (!this.UsedForEditing || this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.ScaleDirty))
if (!this.UsedForEditing || this.GetBit(Bits.ScaleDirty))
{
this.ClearBit(Microsoft.Iris.ViewItems.Text.Bits.ScaleDirty);
this.ClearBit(Bits.ScaleDirty);
measureParams.SetScale(this._scale);
}
if (this._parsedContent != null)
@@ -825,22 +825,22 @@ namespace Microsoft.Iris.ViewItems
{
get
{
if (!this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasureValid))
if (!this.GetBit(Bits.FastMeasureValid))
{
bool flag = this.UsingSharedRasterizer && !this.WordWrap && (this._namedStyles == null && _scale == 1.0) && (this.TextSharpness == TextSharpness.Sharp && !this.UsePasswordMask) && !this.Zone.Session.IsRtl;
if (flag)
flag = Microsoft.Iris.ViewItems.Text.SharedSimpleTextRasterizer.CanMeasure(this.Content, this.GetEffectiveTextStyle());
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasurePossible, flag);
this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasureValid);
flag = SharedSimpleTextRasterizer.CanMeasure(this.Content, this.GetEffectiveTextStyle());
this.SetBit(Bits.FastMeasurePossible, flag);
this.SetBit(Bits.FastMeasureValid);
}
return this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasurePossible);
return this.GetBit(Bits.FastMeasurePossible);
}
}
internal TextStyle GetEffectiveTextStyle()
{
TextStyle textStyle = new TextStyle();
Font font = this._font ?? Microsoft.Iris.ViewItems.Text.s_defaultFont;
Font font = this._font ?? s_defaultFont;
textStyle.FontFace = font.FontName;
textStyle.FontSize = font.FontSize;
if (font.AltFontSize != (double)font.FontSize)
@@ -852,11 +852,11 @@ namespace Microsoft.Iris.ViewItems
if ((font.FontStyle & FontStyles.Underline) != FontStyles.None)
textStyle.Underline = true;
textStyle.Color = this._textColor;
if (this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.LineSpacingSet))
if (this.GetBit(Bits.LineSpacingSet))
textStyle.LineSpacing = this.LineSpacing;
if (this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.CharacterSpacingSet))
if (this.GetBit(Bits.CharacterSpacingSet))
textStyle.CharacterSpacing = this.CharacterSpacing;
if (this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.EnableKerningSet))
if (this.GetBit(Bits.EnableKerningSet))
textStyle.EnableKerning = this.EnableKerning;
if (this._textStyle != null)
textStyle.Add(this._textStyle);
@@ -872,7 +872,7 @@ namespace Microsoft.Iris.ViewItems
arrayList = this.AnnotateFragments();
bool flag = false;
if (this._fragments != null || arrayList != null)
flag = this.TextLayoutInvalid || !Microsoft.Iris.ViewItems.Text.AreFragmentListsEquivalent(_fragments, arrayList);
flag = this.TextLayoutInvalid || !AreFragmentListsEquivalent(_fragments, arrayList);
if (flag)
{
this.UnregisterFragmentUsage();
@@ -1198,7 +1198,7 @@ namespace Microsoft.Iris.ViewItems
if (run.Visible && !run.IsFragment)
{
Color effectiveColor = this.GetEffectiveColor(run);
IImage imageForRun = Microsoft.Iris.ViewItems.Text.GetImageForRun(this.UISession, run, effectiveColor);
IImage imageForRun = GetImageForRun(this.UISession, run, effectiveColor);
if (imageForRun != null)
{
float x = run.RenderBounds.Left + _lineAlignmentOffset;
@@ -1325,8 +1325,8 @@ namespace Microsoft.Iris.ViewItems
private void MarkTextLayoutInvalid()
{
this.TextLayoutInvalid = true;
if (Microsoft.Iris.ViewItems.Text.s_simpleTextMeasureAvailable)
this.ClearBit(Microsoft.Iris.ViewItems.Text.Bits.FastMeasureValid);
if (s_simpleTextMeasureAvailable)
this.ClearBit(Bits.FastMeasureValid);
this.DisposeFlow();
this.MarkLayoutInvalid();
}
@@ -1363,50 +1363,50 @@ namespace Microsoft.Iris.ViewItems
private bool TextFitsWidth
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.TextFitsWidth);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.TextFitsWidth, value);
get => this.GetBit(Bits.TextFitsWidth);
set => this.SetBit(Bits.TextFitsWidth, value);
}
private bool TextFitsHeight
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.TextFitsHeight);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.TextFitsHeight, value);
get => this.GetBit(Bits.TextFitsHeight);
set => this.SetBit(Bits.TextFitsHeight, value);
}
private bool ClipToHeight
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.ClipToHeight);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.ClipToHeight, value);
get => this.GetBit(Bits.ClipToHeight);
set => this.SetBit(Bits.ClipToHeight, value);
}
private bool KeepFlowAlive
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.KeepFlowAlive);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.KeepFlowAlive, value);
get => this.GetBit(Bits.KeepFlowAlive);
set => this.SetBit(Bits.KeepFlowAlive, value);
}
private bool HasEverPainted
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.HasEverPainted);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.HasEverPainted, value);
get => this.GetBit(Bits.HasEverPainted);
set => this.SetBit(Bits.HasEverPainted, value);
}
private bool TextLayoutInvalid
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.TextLayoutInvalid);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.TextLayoutInvalid, value);
get => this.GetBit(Bits.TextLayoutInvalid);
set => this.SetBit(Bits.TextLayoutInvalid, value);
}
private bool UpdateFragmentsAfterLayout
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.UpdateFragmentsAfterLayout);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.UpdateFragmentsAfterLayout, value);
get => this.GetBit(Bits.UpdateFragmentsAfterLayout);
set => this.SetBit(Bits.UpdateFragmentsAfterLayout, value);
}
private bool IgnoreEffectiveScaleChanges
{
get => this.GetBit(Microsoft.Iris.ViewItems.Text.Bits.IgnoreEffectiveScaleChanges);
set => this.SetBit(Microsoft.Iris.ViewItems.Text.Bits.IgnoreEffectiveScaleChanges, value);
get => this.GetBit(Bits.IgnoreEffectiveScaleChanges);
set => this.SetBit(Bits.IgnoreEffectiveScaleChanges, value);
}
private bool GetBit(Microsoft.Iris.ViewItems.Text.Bits lookupBit) => ((Microsoft.Iris.ViewItems.Text.Bits)this._bits & lookupBit) != 0;
@@ -1437,7 +1437,7 @@ namespace Microsoft.Iris.ViewItems
public TextFragment fragment;
private static uint s_rangeIDIndicator = 1073741824;
public Color RangeIDAsColor => new Color(Microsoft.Iris.ViewItems.Text.MarkedRange.s_rangeIDIndicator | this.rangeID);
public Color RangeIDAsColor => new Color(s_rangeIDIndicator | this.rangeID);
public Color GetEffectiveColor(Color defaultColor)
{
UIX/Microsoft/Iris/ViewItems/UIPropertyRecord.cs
+1 -1
View File
@@ -32,6 +32,6 @@ namespace Microsoft.Iris.ViewItems
return null;
}
public static bool IsInList(Vector<UIPropertyRecord> list, string name) => UIPropertyRecord.FindInList(list, name) != null;
public static bool IsInList(Vector<UIPropertyRecord> list, string name) => FindInList(list, name) != null;
}
}
UIX/Microsoft/Iris/ViewItems/VisibleIndexRangeLayoutOutput.cs
+2 -2
View File
@@ -42,9 +42,9 @@ namespace Microsoft.Iris.ViewItems
public int EndVisibleOffscreen => this._endVisibleOffscreen;
public override DataCookie OutputID => VisibleIndexRangeLayoutOutput.DataCookie;
public override DataCookie OutputID => DataCookie;
public static DataCookie DataCookie => VisibleIndexRangeLayoutOutput.s_dataProperty;
public static DataCookie DataCookie => s_dataProperty;
public override string ToString() => InvariantString.Format("{0} (BeginVisibleOffscreen={1}, EndVisibleOffscreen={2})", this.GetType().Name, _beginVisibleOffscreen, _endVisibleOffscreen);
}