mirror of
https://gitcode.com/gh_mirrors/se/Semi.Avalonia
synced 2026-04-26 11:17:55 +08:00
Merge pull request #653 from shatyuka/main
fix: fix controls under TextBox inheriting Ibeam cursor
This commit is contained in:
@@ -29,7 +29,6 @@
|
|||||||
<Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
|
<Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
||||||
<Setter Property="Cursor" Value="Ibeam" />
|
|
||||||
<Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
<Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
<Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
|
||||||
@@ -97,6 +96,11 @@
|
|||||||
TextAlignment="{TemplateBinding TextAlignment}"
|
TextAlignment="{TemplateBinding TextAlignment}"
|
||||||
TextWrapping="{TemplateBinding TextWrapping}" />
|
TextWrapping="{TemplateBinding TextWrapping}" />
|
||||||
</Panel>
|
</Panel>
|
||||||
|
<ScrollViewer.Styles>
|
||||||
|
<Style Selector="ScrollContentPresenter#PART_ContentPresenter">
|
||||||
|
<Setter Property="Cursor" Value="Ibeam" />
|
||||||
|
</Style>
|
||||||
|
</ScrollViewer.Styles>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
<Button
|
<Button
|
||||||
Name="PART_ClearButton"
|
Name="PART_ClearButton"
|
||||||
|
|||||||
Reference in New Issue
Block a user