mirror of
https://gitcode.com/gh_mirrors/se/Semi.Avalonia
synced 2026-04-27 19:53:23 +08:00
fix: controls under TextBox inheriting Ibeam cursor (#710)
This commit is contained in:
@@ -260,7 +260,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}" />
|
||||||
@@ -328,6 +327,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"
|
||||||
@@ -483,7 +487,6 @@
|
|||||||
<Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
|
||||||
<Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
<Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
||||||
<Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
<Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
||||||
<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}" />
|
||||||
@@ -542,6 +545,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>
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
|
|||||||
Reference in New Issue
Block a user