Browse Source

Show IBeam cursor for IsTextSelectionEnabled

pull/8471/head
Benedikt Stebner 4 years ago
parent
commit
0372dd914c
  1. 2
      src/Avalonia.Controls/RichTextBlock.cs
  2. 8
      src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
  3. 10
      src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
  4. 1
      src/Avalonia.Themes.Default/DefaultTheme.xaml
  5. 8
      src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
  6. 1
      src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
  7. 10
      src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml

2
src/Avalonia.Controls/RichTextBlock.cs

@ -66,7 +66,7 @@ namespace Avalonia.Controls
{
FocusableProperty.OverrideDefaultValue(typeof(RichTextBlock), true);
AffectsRender<RichTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionBrushProperty);
AffectsRender<RichTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionBrushProperty, IsTextSelectionEnabledProperty);
}
public RichTextBlock()

8
src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj

@ -9,6 +9,14 @@
<ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
<AvaloniaResource Include="**/*.xaml" />
</ItemGroup>
<ItemGroup>
<None Remove="Controls\RichTextBlock.xaml" />
</ItemGroup>
<ItemGroup>
<AvaloniaResource Update="Controls\RichTextBlock.xaml">
<Generator>MSBuild:Compile</Generator>
</AvaloniaResource>
</ItemGroup>
<Import Project="..\..\build\BuildTargets.targets" />
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\ApiDiff.props" />

10
src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml

@ -0,0 +1,10 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.PreviewWith>
<RichTextBlock IsTextSelectionEnabled="True" Text="Preview"/>
</Design.PreviewWith>
<Style Selector="RichTextBlock[IsTextSelectionEnabled=true]">
<Setter Property="Cursor" Value="IBeam" />
</Style>
</Styles>

1
src/Avalonia.Themes.Default/DefaultTheme.xaml

@ -66,4 +66,5 @@
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RichTextBlock.xaml"/>
</Styles>

8
src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

@ -10,6 +10,14 @@
<AvaloniaResource Include="**/*.xaml" />
<AvaloniaResource Include="Assets\*" />
</ItemGroup>
<ItemGroup>
<None Remove="Controls\RichTextBlock.xaml" />
</ItemGroup>
<ItemGroup>
<AvaloniaResource Update="Controls\RichTextBlock.xaml">
<Generator>MSBuild:Compile</Generator>
</AvaloniaResource>
</ItemGroup>
<Import Project="..\..\build\BuildTargets.targets" />
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\ApiDiff.props" />

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

@ -67,4 +67,5 @@
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml"/>
<!-- ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all-->
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml"/>
</Styles>

10
src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml

@ -0,0 +1,10 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.PreviewWith>
<RichTextBlock IsTextSelectionEnabled="True" Text="Preview"/>
</Design.PreviewWith>
<Style Selector="RichTextBlock[IsTextSelectionEnabled=true]">
<Setter Property="Cursor" Value="IBeam" />
</Style>
</Styles>
Loading…
Cancel
Save