zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-04-08 18:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Watermark -> Placeholder. (#769)

Browse Source
This commit is contained in:
Zhang Dian
2026-03-15 03:40:20 +08:00
committed by GitHub
parent d6d03133b4
commit 672560643b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
View File

@@ -33,6 +33,6 @@
Margin="0,0,0,8" Margin="0,0,0,8"
CustomDateFormatString="ddd, MMM d" CustomDateFormatString="ddd, MMM d"
SelectedDateFormat="Custom" /> SelectedDateFormat="Custom" />
<CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" /> <CalendarDatePicker Margin="0,0,0,8" PlaceholderText="Placeholder" />
</StackPanel> </StackPanel>
</UserControl> </UserControl>

2
demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
View File

@@ -16,7 +16,7 @@
Margin="8" Margin="8"
Classes="ClearButton" Classes="ClearButton"
Text="{Binding SearchText}" Text="{Binding SearchText}"
Watermark="Input Icon Name" /> PlaceholderText="Input Icon Name" />
<TabControl <TabControl
Grid.Row="1" Grid.Row="1"

2
src/Semi.Avalonia/Controls/DatePicker.axaml
View File

@@ -261,7 +261,7 @@
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonDisabledIconForeground}" /> <Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonDisabledIconForeground}" />
</Style> </Style>
<!-- Changes foreground for watermark text when SelectedDate is null --> <!-- Changes foreground for placeholder text when SelectedDate is null -->
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock"> <Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
</Style> </Style>

6
src/Semi.Avalonia/Controls/TextBox.axaml
View File

@@ -67,7 +67,7 @@
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel> <Panel>
<TextBlock <TextBlock
Name="PART_Watermark" Name="PART_Placeholder"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Foreground="{TemplateBinding PlaceholderForeground}" Foreground="{TemplateBinding PlaceholderForeground}"
@@ -301,7 +301,7 @@
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel> <Panel>
<TextBlock <TextBlock
Name="PART_Watermark" Name="PART_Placeholder"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Opacity="0.5" Opacity="0.5"
@@ -523,7 +523,7 @@
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel> <Panel>
<TextBlock <TextBlock
Name="PART_Watermark" Name="PART_Placeholder"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Opacity="0.5" Opacity="0.5"