Browse Source

Replace Size with Width

The height value was unused and always -1.
pull/1/head
Drew Noakes 7 years ago
parent
commit
05321769f0
  1. 4
      Project/Src/Gui/AbstractMargin.cs
  2. 4
      Project/Src/Gui/FoldMargin.cs
  3. 6
      Project/Src/Gui/GutterMargin.cs
  4. 6
      Project/Src/Gui/IconBarMargin.cs
  5. 4
      Project/Src/Gui/TextArea.cs
  6. 2
      Project/Src/Gui/TextAreaControl.cs

4
Project/Src/Gui/AbstractMargin.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.TextEditor
public virtual Cursor Cursor { get; set; } = Cursors.Default;
public virtual Size Size => new Size(width: -1, height: -1);
public virtual int Width => -1;
public virtual bool IsVisible => true;
@ -73,4 +73,4 @@ namespace ICSharpCode.TextEditor
public event MarginMouseEventHandler MouseMove;
public event EventHandler MouseLeave;
}
}
}

4
Project/Src/Gui/FoldMargin.cs

@ -25,9 +25,7 @@ namespace ICSharpCode.TextEditor
{
}
public override Size Size => new Size(
textArea.TextView.FontHeight,
height: -1);
public override int Width => textArea.TextView.FontHeight;
public override bool IsVisible => textArea.TextEditorProperties.EnableFolding;

6
Project/Src/Gui/GutterMargin.cs

@ -41,10 +41,8 @@ namespace ICSharpCode.TextEditor
public override Cursor Cursor => RightLeftCursor;
public override Size Size => new Size(
width: textArea.TextView.WideSpaceWidth
* Math.Max(4, (int)Math.Log10(textArea.Document.TotalNumberOfLines) + 4),
height: -1);
public override int Width
=> textArea.TextView.WideSpaceWidth*Math.Max(4, (int)Math.Log10(textArea.Document.TotalNumberOfLines) + 4);
public override bool IsVisible => textArea.TextEditorProperties.ShowLineNumbers;

6
Project/Src/Gui/IconBarMargin.cs

@ -21,13 +21,11 @@ namespace ICSharpCode.TextEditor
{
private const int iconBarWidth = 18;
private static readonly Size iconBarSize = new Size(iconBarWidth, height: -1);
public IconBarMargin(TextArea textArea) : base(textArea)
{
}
public override Size Size => iconBarSize;
public override int Width => iconBarWidth;
public override bool IsVisible => textArea.TextEditorProperties.IsIconBarVisible;
@ -258,4 +256,4 @@ namespace ICSharpCode.TextEditor
#endregion
}
}
}

4
Project/Src/Gui/TextArea.cs

@ -463,7 +463,7 @@ namespace ICSharpCode.TextEditor
foreach (var margin in leftMargins)
if (margin.IsVisible)
{
var marginRectangle = new Rectangle(currentXPos, currentYPos, margin.Size.Width, Height - currentYPos);
var marginRectangle = new Rectangle(currentXPos, currentYPos, margin.Width, Height - currentYPos);
if (marginRectangle != margin.DrawingPosition)
{
// margin changed size
@ -904,4 +904,4 @@ namespace ICSharpCode.TextEditor
//internal void
}
}
}

2
Project/Src/Gui/TextAreaControl.cs

@ -205,7 +205,7 @@ namespace ICSharpCode.TextEditor
var h = scrollVisibilities.HasFlag(ScrollVisibilities.H);
var vScrollSize = v ? SystemInformation.VerticalScrollBarArrowHeight : 0;
var hScrollSize = h ? SystemInformation.HorizontalScrollBarArrowWidth : 0;
var x0 = TextArea.LeftMargins.Where(margin => margin.IsVisible).Sum(margin => margin.Size.Width);
var x0 = TextArea.LeftMargins.Where(margin => margin.IsVisible).Sum(margin => margin.Width);
var hRuleBounds = hRuler != null
? new Rectangle(

Loading…
Cancel
Save