Browse Source

Merge branch 'master' into precise-nocom-locks

pull/5149/head
Dariusz Komosiński 6 years ago
committed by GitHub
parent
commit
962d03b191
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/Avalonia.Controls/TextBox.cs
  2. 1
      src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
  3. 2
      src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml

5
src/Avalonia.Controls/TextBox.cs

@ -867,7 +867,10 @@ namespace Avalonia.Controls
{ {
var point = e.GetPosition(_presenter); var point = e.GetPosition(_presenter);
point = new Point(MathUtilities.Clamp(point.X, 0, _presenter.Bounds.Width - 1), MathUtilities.Clamp(point.Y, 0, _presenter.Bounds.Height - 1)); point = new Point(
MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
CaretIndex = SelectionEnd = _presenter.GetCaretIndex(point); CaretIndex = SelectionEnd = _presenter.GetCaretIndex(point);
} }
} }

1
src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml

@ -39,6 +39,7 @@
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="TextBlock.FontSize" Value="{DynamicResource ContentControlFontSize}" /> <Setter Property="TextBlock.FontSize" Value="{DynamicResource ContentControlFontSize}" />
<Setter Property="TextBlock.FontWeight" Value="Normal" /> <Setter Property="TextBlock.FontWeight" Value="Normal" />
<Setter Property="WindowManagerAddShadowHint" Value="False" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border Background="{TemplateBinding Background}" <Border Background="{TemplateBinding Background}"

2
src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml

@ -110,7 +110,7 @@
</Grid> </Grid>
</Border> </Border>
<Popup Name="PART_Popup" <Popup Name="PART_Popup"
WindowManagerAddShadowHint="True" WindowManagerAddShadowHint="False"
PlacementMode="Right" PlacementMode="Right"
HorizontalOffset="{StaticResource MenuFlyoutSubItemPopupHorizontalOffset}" HorizontalOffset="{StaticResource MenuFlyoutSubItemPopupHorizontalOffset}"
IsLightDismissEnabled="True" IsLightDismissEnabled="True"

Loading…
Cancel
Save