Browse Source
Merge branch 'master' into fixes/1436-border-layout-issues
pull/1488/head
danwalmsley
9 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
1 deletions
-
src/Avalonia.Controls/Button.cs
-
src/Avalonia.Controls/DropDown.cs
-
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.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; |
|
|
|
|
|
@ -164,6 +164,7 @@ namespace Avalonia.Controls |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
IsDropDownOpen = !IsDropDownOpen; |
|
|
IsDropDownOpen = !IsDropDownOpen; |
|
|
|
|
|
e.Handled = true; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
base.OnPointerPressed(e); |
|
|
base.OnPointerPressed(e); |
|
|
|
|
|
@ -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)) |
|
|
}; |
|
|
}; |
|
|
|