fix: Make the password prompt title in taskbar and UI title consistent. fix #847

VShawn · VShawn · commit 0c64c3e078cd · 2025-02-10T14:31:23.000+08:00
diff --git a/Ui/View/Editor/IconPopupDialogView.xaml b/Ui/View/Editor/IconPopupDialogView.xaml
@@ -5,10 +5,6 @@
                          xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
                          xmlns:styles="clr-namespace:Shawn.Utils.WpfResources.Theme.Styles;assembly=Shawn.Utils.WpfResources"
                          xmlns:editor="clr-namespace:_1RM.View.Editor"
-                         xmlns:model="clr-namespace:_1RM.Service.DataSource.Model"
-                         xmlns:dao="clr-namespace:_1RM.Service.DataSource.DAO"
-                         xmlns:attachProperty="clr-namespace:Shawn.Utils.WpfResources.Theme.AttachProperty;assembly=Shawn.Utils.WpfResources"
-                         xmlns:controls="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
                          xmlns:icons="clr-namespace:_1RM.Resources.Icons"
                          xmlns:s="https://github.com/canton7/Stylet"
                          mc:Ignorable="d" 
@@ -17,6 +13,7 @@
                          SizeToContent="WidthAndHeight" 
                          Background="Transparent"
                          AllowsTransparency="True"
+                         Title="Select Icon"
                          d:DataContext="{d:DesignInstance editor:IconPopupDialogViewModel}">
     <Window.Resources>
         <Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockBase}">
diff --git a/Ui/View/Editor/PasswordPopupDialogView.xaml b/Ui/View/Editor/PasswordPopupDialogView.xaml
@@ -7,7 +7,7 @@
                          xmlns:attachProperty="clr-namespace:Shawn.Utils.WpfResources.Theme.AttachProperty;assembly=Shawn.Utils.WpfResources"
                          xmlns:editor="clr-namespace:_1RM.View.Editor"
                          xmlns:controls="clr-namespace:_1RM.Controls"
-                         ShowInTaskbar="False"
+                         ShowInTaskbar="True"
                          ResizeMode="NoResize"
                          WindowStyle="None"
                          SizeToContent="Height"
diff --git a/Ui/View/Editor/PasswordPopupDialogViewModel.cs b/Ui/View/Editor/PasswordPopupDialogViewModel.cs
@@ -19,7 +19,21 @@ public class PasswordPopupDialogViewModel : NotifyPropertyChangedBaseScreen
     {
         public bool DialogResult { get; set; } = false;
 
-        public string Title { get; set; } = "";
+        private string _title = "";
+        public string Title
+        {
+            get => _title;
+            set
+            {
+                if (SetAndNotify(ref _title, value))
+                {
+                    if (View is PasswordPopupDialogView v)
+                    {
+                        v.Title = value;
+                    }
+                }
+            }
+        }
 
         private string _userName = "";
         public string UserName
@@ -91,6 +105,8 @@ protected override void OnViewLoaded()
             base.OnViewLoaded();
             if (View is PasswordPopupDialogView v)
             {
+                v.Title = Title;
+
                 v.TbUserName.Text = UserName;
                 v.TbPwd.Password = Password;
 
