tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Line endings again.

pull/10/head
Steven Kirk 12 years ago
parent
127c27fd6b
commit
3eddb7053c
3 changed files with 189 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
  2. 252
      Perspex.Controls/TextBoxView.cs
  3. 42
      Perspex.SceneGraph/Platform/ITextService.cs

84
Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
View File

@ -1,42 +1,42 @@
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// <copyright file="BitmapImpl.cs" company="Steven Kirk"> // <copyright file="BitmapImpl.cs" company="Steven Kirk">
// Copyright 2014 MIT Licence. See licence.md for more information. // Copyright 2014 MIT Licence. See licence.md for more information.
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Cairo.Media.Imaging namespace Perspex.Cairo.Media.Imaging
{ {
using System; using System;
using Perspex.Platform; using Perspex.Platform;
using Cairo = global::Cairo; using Cairo = global::Cairo;
public class BitmapImpl : IBitmapImpl public class BitmapImpl : IBitmapImpl
{ {
public BitmapImpl(Cairo.ImageSurface surface) public BitmapImpl(Cairo.ImageSurface surface)
{ {
this.Surface = surface; this.Surface = surface;
} }
public int PixelWidth public int PixelWidth
{ {
get { return this.Surface.Width; } get { return this.Surface.Width; }
} }
public int PixelHeight public int PixelHeight
{ {
get { return this.Surface.Height; } get { return this.Surface.Height; }
} }
public Cairo.ImageSurface Surface public Cairo.ImageSurface Surface
{ {
get; get;
private set; private set;
} }
public void Save(string fileName) public void Save(string fileName)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
} }

252
Perspex.Controls/TextBoxView.cs
View File

@ -1,126 +1,126 @@
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// <copyright file="TextBoxView.cs" company="Steven Kirk"> // <copyright file="TextBoxView.cs" company="Steven Kirk">
// Copyright 2013 MIT Licence. See licence.md for more information. // Copyright 2013 MIT Licence. See licence.md for more information.
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Controls namespace Perspex.Controls
{ {
using System; using System;
using Perspex.Media; using Perspex.Media;
using Perspex.Platform; using Perspex.Platform;
using Perspex.Threading; using Perspex.Threading;
using Splat; using Splat;
internal class TextBoxView : Control internal class TextBoxView : Control
{ {
private TextBox parent; private TextBox parent;
private FormattedText formattedText; private FormattedText formattedText;
private DispatcherTimer caretTimer; private DispatcherTimer caretTimer;
private bool caretBlink; private bool caretBlink;
public TextBoxView(TextBox parent) public TextBoxView(TextBox parent)
{ {
this.caretTimer = new DispatcherTimer(); this.caretTimer = new DispatcherTimer();
this.caretTimer.Interval = TimeSpan.FromMilliseconds(500); this.caretTimer.Interval = TimeSpan.FromMilliseconds(500);
this.caretTimer.Tick += this.CaretTimerTick; this.caretTimer.Tick += this.CaretTimerTick;
this.parent = parent; this.parent = parent;
} }
public FormattedText FormattedText public FormattedText FormattedText
{ {
get get
{ {
if (this.formattedText == null) if (this.formattedText == null)
{ {
this.formattedText = this.CreateFormattedText(); this.formattedText = this.CreateFormattedText();
} }
return this.formattedText; return this.formattedText;
} }
} }
public new void GotFocus() public new void GotFocus()
{ {
this.caretBlink = true; this.caretBlink = true;
this.caretTimer.Start(); this.caretTimer.Start();
} }
public new void LostFocus() public new void LostFocus()
{ {
this.caretTimer.Stop(); this.caretTimer.Stop();
this.InvalidateVisual(); this.InvalidateVisual();
} }
public void InvalidateText() public void InvalidateText()
{ {
this.formattedText = null; this.formattedText = null;
this.InvalidateMeasure(); this.InvalidateMeasure();
} }
internal void CaretMoved() internal void CaretMoved()
{ {
this.caretBlink = true; this.caretBlink = true;
this.caretTimer.Stop(); this.caretTimer.Stop();
this.caretTimer.Start(); this.caretTimer.Start();
this.InvalidateVisual(); this.InvalidateVisual();
} }
public override void Render(IDrawingContext context) public override void Render(IDrawingContext context)
{ {
Rect rect = new Rect(this.ActualSize); Rect rect = new Rect(this.ActualSize);
context.DrawText(Brushes.Black, rect, this.FormattedText); context.DrawText(Brushes.Black, rect, this.FormattedText);
if (this.parent.IsFocused) if (this.parent.IsFocused)
{ {
ITextService textService = Locator.Current.GetService<ITextService>(); ITextService textService = Locator.Current.GetService<ITextService>();
Point caretPos = textService.GetCaretPosition( Point caretPos = textService.GetCaretPosition(
this.formattedText, this.formattedText,
this.parent.CaretIndex, this.parent.CaretIndex,
this.ActualSize); this.ActualSize);
double[] lineHeights = textService.GetLineHeights(this.formattedText, this.ActualSize); double[] lineHeights = textService.GetLineHeights(this.formattedText, this.ActualSize);
Brush caretBrush = Brushes.Black; Brush caretBrush = Brushes.Black;
if (this.caretBlink) if (this.caretBlink)
{ {
context.DrawLine( context.DrawLine(
new Pen(caretBrush, 1), new Pen(caretBrush, 1),
caretPos, caretPos,
new Point(caretPos.X, caretPos.Y + lineHeights[0])); new Point(caretPos.X, caretPos.Y + lineHeights[0]));
} }
} }
} }
protected override Size MeasureOverride(Size constraint) protected override Size MeasureOverride(Size constraint)
{ {
if (!string.IsNullOrEmpty(this.parent.Text)) if (!string.IsNullOrEmpty(this.parent.Text))
{ {
ITextService textService = Locator.Current.GetService<ITextService>(); ITextService textService = Locator.Current.GetService<ITextService>();
return textService.Measure(this.FormattedText, constraint); return textService.Measure(this.FormattedText, constraint);
} }
return new Size(); return new Size();
} }
private FormattedText CreateFormattedText() private FormattedText CreateFormattedText()
{ {
return new FormattedText return new FormattedText
{ {
FontFamilyName = "Segoe UI", FontFamilyName = "Segoe UI",
FontSize = this.GetValue(TextBlock.FontSizeProperty), FontSize = this.GetValue(TextBlock.FontSizeProperty),
FontStyle = this.GetValue(TextBlock.FontStyleProperty), FontStyle = this.GetValue(TextBlock.FontStyleProperty),
Text = this.parent.Text, Text = this.parent.Text,
}; };
} }
private void CaretTimerTick(object sender, EventArgs e) private void CaretTimerTick(object sender, EventArgs e)
{ {
this.caretBlink = !this.caretBlink; this.caretBlink = !this.caretBlink;
this.InvalidateVisual(); this.InvalidateVisual();
} }
} }
} }

42
Perspex.SceneGraph/Platform/ITextService.cs
View File

@ -1,21 +1,21 @@
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// <copyright file="ITextService.cs" company="Steven Kirk"> // <copyright file="ITextService.cs" company="Steven Kirk">
// Copyright 2014 MIT Licence. See licence.md for more information. // Copyright 2014 MIT Licence. See licence.md for more information.
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Platform namespace Perspex.Platform
{ {
using Perspex.Media; using Perspex.Media;
public interface ITextService public interface ITextService
{ {
int GetCaretIndex(FormattedText text, Point point, Size constraint); int GetCaretIndex(FormattedText text, Point point, Size constraint);
Point GetCaretPosition(FormattedText text, int caretIndex, Size constraint); Point GetCaretPosition(FormattedText text, int caretIndex, Size constraint);
double[] GetLineHeights(FormattedText text, Size constraint); double[] GetLineHeights(FormattedText text, Size constraint);
Size Measure(FormattedText text, Size constraint); Size Measure(FormattedText text, Size constraint);
} }
} }

Write Preview
Loading…
Cancel
Save