From e351e113ee05671903bb8f9677e8d4066f037e2b Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Mon, 5 Sep 2022 14:23:16 +0800
Subject: [PATCH] =?UTF-8?q?*=20UITextBox:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E6=97=A0=E6=B0=B4=E5=8D=B0=E6=96=87=E5=AD=97=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=89=E6=A0=87=E6=9C=89=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Controls/UIEdit.cs    | 5 +++++
 SunnyUI/Controls/UITextBox.cs | 1 +
 2 files changed, 6 insertions(+)

diff --git a/SunnyUI/Controls/UIEdit.cs b/SunnyUI/Controls/UIEdit.cs
index 3b326ff0..e3dbf872 100644
--- a/SunnyUI/Controls/UIEdit.cs
+++ b/SunnyUI/Controls/UIEdit.cs
@@ -77,6 +77,7 @@ namespace Sunny.UI
 
         private void waterMarkContainer_Paint(object sender, PaintEventArgs e)
         {
+            waterMarkContainer.Visible = Watermark.IsValid();
             waterMarkContainer.Location = new Point(2, 0);
             waterMarkContainer.Height = this.Height;
             waterMarkContainer.Width = this.Width;
@@ -158,8 +159,12 @@ namespace Sunny.UI
         protected override void OnInvalidated(InvalidateEventArgs e)
         {
             base.OnInvalidated(e);
+
             if (waterMarkContainer != null)
+            {
+                waterMarkContainer.Visible = Watermark.IsValid();
                 waterMarkContainer.Invalidate();
+            }
         }
 
         [Browsable(false), DefaultValue(false)]
diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs
index 9566ebab..4322f998 100644
--- a/SunnyUI/Controls/UITextBox.cs
+++ b/SunnyUI/Controls/UITextBox.cs
@@ -37,6 +37,7 @@
  * 2022-06-23: V3.2.0 重写水印文字，解决不同背景色下泛白的问题
  * 2022-07-17: V3.2.1 增加SelectionChanged事件
  * 2022-07-28: V3.2.2 修复了有水印文字时，不响应Click和DoubleClick事件的问题
+ * 2022-09-05: V3.2.3 修复了无水印文字时，光标有时不显示的问题
 ******************************************************************************/
 
 using System;