Browse Source

Merge branch 'master' into fixes/1436-border-layout-issues

pull/1488/head
danwalmsley 9 years ago
committed by GitHub
parent
commit
d944f36d88
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/Button.cs
  2. 1
      src/Avalonia.Controls/DropDown.cs
  3. 1
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs

2
src/Avalonia.Controls/Button.cs

@ -245,7 +245,7 @@ namespace Avalonia.Controls
{ {
base.OnPointerReleased(e); base.OnPointerReleased(e);
if (e.MouseButton == MouseButton.Left) if (IsPressed && e.MouseButton == MouseButton.Left)
{ {
e.Device.Capture(null); e.Device.Capture(null);
IsPressed = false; IsPressed = false;

1
src/Avalonia.Controls/DropDown.cs

@ -164,6 +164,7 @@ namespace Avalonia.Controls
else else
{ {
IsDropDownOpen = !IsDropDownOpen; IsDropDownOpen = !IsDropDownOpen;
e.Handled = true;
} }
} }
base.OnPointerPressed(e); base.OnPointerPressed(e);

1
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs

@ -43,6 +43,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
Mode = Mode, Mode = Mode,
Path = pathInfo.Path, Path = pathInfo.Path,
Priority = Priority, Priority = Priority,
Source = Source,
RelativeSource = pathInfo.RelativeSource ?? RelativeSource, RelativeSource = pathInfo.RelativeSource ?? RelativeSource,
DefaultAnchor = new WeakReference(GetDefaultAnchor((ITypeDescriptorContext)serviceProvider)) DefaultAnchor = new WeakReference(GetDefaultAnchor((ITypeDescriptorContext)serviceProvider))
}; };

Loading…
Cancel
Save