Merge pull request #308 from irihitech/text

Fix watermark before IME commit
irihitech · Mar 8, 2024 · 7acd741 · 7acd741
2 parents 341fa79 + 38cbc6d
commit 7acd741
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -91,12 +91,17 @@
                                         Name="PART_Watermark"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        IsVisible="{TemplateBinding Text,
-                                                                    Converter={x:Static StringConverters.IsNullOrEmpty}}"
                                         Opacity="0.5"
                                         Text="{TemplateBinding Watermark}"
                                         TextAlignment="{TemplateBinding TextAlignment}"
-                                        TextWrapping="{TemplateBinding TextWrapping}" />
+                                        TextWrapping="{TemplateBinding TextWrapping}">
+                                        <TextBlock.IsVisible>
+                                            <MultiBinding Converter="{x:Static BoolConverters.And}">
+                                                <Binding ElementName="PART_TextPresenter" Path="PreeditText" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
+                                                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
+                                            </MultiBinding>
+                                        </TextBlock.IsVisible>
+                                    </TextBlock>
                                     <TextPresenter
                                         Name="PART_TextPresenter"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"