Browse Source

Merge branch 'master' into FixFor946

pull/947/head
Steven Kirk 9 years ago
committed by GitHub
parent
commit
fab20c42eb
  1. 2
      readme.md
  2. 2
      src/Avalonia.Controls/Button.cs
  3. 2
      src/Avalonia.Controls/Primitives/Thumb.cs
  4. 2
      src/Avalonia.Controls/TextBox.cs
  5. 2
      src/Avalonia.HtmlRenderer/HtmlControl.cs
  6. 2
      src/Avalonia.Input/InputElement.cs

2
readme.md

@ -3,7 +3,7 @@
| Gitter Chat | Windows Build Status | Linux/Mac Build Status | Code Coverage |
|---|---|---|---|
| [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) | [![codecov](https://codecov.io/gh/AvaloniaUI/Avalonia/branch/master/graph/badge.svg)](https://codecov.io/gh/AvaloniaUI/Avalonia) |
| [![Gitter](https://badges.gitter.im/Join%20Chat.svg))](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) | [![codecov](https://codecov.io/gh/AvaloniaUI/Avalonia/branch/master/graph/badge.svg)](https://codecov.io/gh/AvaloniaUI/Avalonia) |
A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android.

2
src/Avalonia.Controls/Button.cs

@ -226,7 +226,7 @@ namespace Avalonia.Controls
}
/// <inheritdoc/>
protected override void OnPointerReleased(PointerEventArgs e)
protected override void OnPointerReleased(PointerReleasedEventArgs e)
{
base.OnPointerReleased(e);

2
src/Avalonia.Controls/Primitives/Thumb.cs

@ -86,7 +86,7 @@ namespace Avalonia.Controls.Primitives
RaiseEvent(ev);
}
protected override void OnPointerReleased(PointerEventArgs e)
protected override void OnPointerReleased(PointerReleasedEventArgs e)
{
if (_lastPoint.HasValue)
{

2
src/Avalonia.Controls/TextBox.cs

@ -522,7 +522,7 @@ namespace Avalonia.Controls
}
}
protected override void OnPointerReleased(PointerEventArgs e)
protected override void OnPointerReleased(PointerReleasedEventArgs e)
{
if (_presenter != null && e.Device.Captured == _presenter)
{

2
src/Avalonia.HtmlRenderer/HtmlControl.cs

@ -413,7 +413,7 @@ namespace Avalonia.Controls.Html
/// <summary>
/// Handle mouse up to handle selection and link click.
/// </summary>
protected override void OnPointerReleased(PointerEventArgs e)
protected override void OnPointerReleased(PointerReleasedEventArgs e)
{
base.OnPointerReleased(e);
LeftMouseButton = false;

2
src/Avalonia.Input/InputElement.cs

@ -473,7 +473,7 @@ namespace Avalonia.Input
/// Called before the <see cref="PointerReleased"/> event occurs.
/// </summary>
/// <param name="e">The event args.</param>
protected virtual void OnPointerReleased(PointerEventArgs e)
protected virtual void OnPointerReleased(PointerReleasedEventArgs e)
{
}

Loading…
Cancel
Save