From 7158492f7390e7eeffcef1fe6f30ff8b28e3e47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?DZ-=E5=BE=A1=E5=AE=85=E6=A1=91?= <guanhuaxin@outlook.com>
Date: Tue, 9 Jul 2019 14:32:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CLEditor/windows/ManageTagsWindow.xaml    |  9 +++++----
 CLEditor/windows/ManageTagsWindow.xaml.cs | 12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CLEditor/windows/ManageTagsWindow.xaml b/CLEditor/windows/ManageTagsWindow.xaml
index 1a3e415..c80ddc6 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml
+++ b/CLEditor/windows/ManageTagsWindow.xaml
@@ -6,19 +6,20 @@
         xmlns:local="clr-namespace:CLEngine.Editor.windows"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="管理场景标签" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" Icon="/CLEngine.Editor;component/content/logo_modern.png" Loaded="Window_Loaded">
+        Title="管理场景标签" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" Icon="/CLEngine.Editor;component/content/logo_modern.png" Loaded="Window_Loaded" >
     <Grid Background="{DynamicResource BackgroundBrush}" Height="270" Width="466">
-        <Label Content="标签:" HorizontalAlignment="Left" Margin="13,10,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
+        <Label Content="标签:" HorizontalAlignment="Left" Margin="13,10,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" FontWeight="Bold"/>
         <ListBox x:Name="TagsListBox"  HorizontalAlignment="Left" Height="191" Margin="17,36,0,0" VerticalAlignment="Top" Width="423" Style="{DynamicResource ListBoxStyle}" BorderBrush="Black" />
 
-        <xctk:WatermarkTextBox x:Name="addBtn" BorderThickness="1" BorderBrush="#1e1e1e" Watermark="添加新标签" Foreground="#e6e6e6" Background="#4c4c4c" Margin="17,236,265,8" KeyDown="addBtn_KeyDown"> <!--SelectAllOnGotFocus="True">-->
+        <xctk:WatermarkTextBox x:Name="addBtn" BorderThickness="1" BorderBrush="#1e1e1e" Watermark="添加新标签" Foreground="#e6e6e6" Background="#4c4c4c" Margin="17,236,234,10" KeyDown="addBtn_KeyDown" >
+            <!--SelectAllOnGotFocus="True">-->
             <xctk:WatermarkTextBox.WatermarkTemplate>
                 <DataTemplate>
                     <ContentControl FontSize="14" Content="{Binding}" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="3 0 0 0"  Foreground="#a6a6a6"/>
                 </DataTemplate>
             </xctk:WatermarkTextBox.WatermarkTemplate>
         </xctk:WatermarkTextBox>
-
+        <Button x:Name="AddBtn" Content="添加" HorizontalAlignment="Left" Margin="250,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="AddBtn_Click"/>
         <Button x:Name="removeBtn" Content="移除" HorizontalAlignment="Left" Margin="351,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="removeBtn_Click"/>
     </Grid>
 </Window>
diff --git a/CLEditor/windows/ManageTagsWindow.xaml.cs b/CLEditor/windows/ManageTagsWindow.xaml.cs
index 2d32c54..674a654 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml.cs
+++ b/CLEditor/windows/ManageTagsWindow.xaml.cs
@@ -55,5 +55,17 @@ namespace CLEngine.Editor.windows
             }
         }
 
+        private void AddBtn_Click(object sender, RoutedEventArgs e)
+        {
+            string text = this.addBtn.Text.Trim();
+            if (text.Equals(string.Empty)) return;
+
+            if (!SceneManager.ActiveScene.CommonTags.Contains(text))
+                SceneManager.ActiveScene.CommonTags.Add(text);
+
+            addBtn.Text = "";
+
+            this.refreshList();
+        }
     }
 }
-- 
Gitee


From 075978c0efa5c8268190c4f15b7b8353cf959317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?DZ-=E5=BE=A1=E5=AE=85=E6=A1=91?= <guanhuaxin@outlook.com>
Date: Wed, 10 Jul 2019 12:47:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CLEditor/windows/ManageTagsWindow.xaml    | 4 ++--
 CLEditor/windows/ManageTagsWindow.xaml.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CLEditor/windows/ManageTagsWindow.xaml b/CLEditor/windows/ManageTagsWindow.xaml
index c80ddc6..7f0ed8f 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml
+++ b/CLEditor/windows/ManageTagsWindow.xaml
@@ -9,7 +9,7 @@
         Title="管理场景标签" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" Icon="/CLEngine.Editor;component/content/logo_modern.png" Loaded="Window_Loaded" >
     <Grid Background="{DynamicResource BackgroundBrush}" Height="270" Width="466">
         <Label Content="标签:" HorizontalAlignment="Left" Margin="13,10,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" FontWeight="Bold"/>
-        <ListBox x:Name="TagsListBox"  HorizontalAlignment="Left" Height="191" Margin="17,36,0,0" VerticalAlignment="Top" Width="423" Style="{DynamicResource ListBoxStyle}" BorderBrush="Black" />
+        <ListBox x:Name="TagsListBox"  HorizontalAlignment="Left" Height="191" Margin="17,36,0,0" VerticalAlignment="Top" Width="423" Style="{DynamicResource ListBoxStyle}"/>
 
         <xctk:WatermarkTextBox x:Name="addBtn" BorderThickness="1" BorderBrush="#1e1e1e" Watermark="添加新标签" Foreground="#e6e6e6" Background="#4c4c4c" Margin="17,236,234,10" KeyDown="addBtn_KeyDown" >
             <!--SelectAllOnGotFocus="True">-->
@@ -19,7 +19,7 @@
                 </DataTemplate>
             </xctk:WatermarkTextBox.WatermarkTemplate>
         </xctk:WatermarkTextBox>
-        <Button x:Name="AddBtn" Content="添加" HorizontalAlignment="Left" Margin="250,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="AddBtn_Click"/>
+        <Button x:Name="EnterBtn" Content="添加" HorizontalAlignment="Left" Margin="250,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="EnterBtn_Click"/>
         <Button x:Name="removeBtn" Content="移除" HorizontalAlignment="Left" Margin="351,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="removeBtn_Click"/>
     </Grid>
 </Window>
diff --git a/CLEditor/windows/ManageTagsWindow.xaml.cs b/CLEditor/windows/ManageTagsWindow.xaml.cs
index 674a654..37de4b2 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml.cs
+++ b/CLEditor/windows/ManageTagsWindow.xaml.cs
@@ -55,7 +55,7 @@ namespace CLEngine.Editor.windows
             }
         }
 
-        private void AddBtn_Click(object sender, RoutedEventArgs e)
+        private void EnterBtn_Click(object sender, RoutedEventArgs e)
         {
             string text = this.addBtn.Text.Trim();
             if (text.Equals(string.Empty)) return;
-- 
Gitee


From 1784cf98fc14021bc89feef842fe562894ce97ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?DZ-=E5=BE=A1=E5=AE=85=E6=A1=91?= <guanhuaxin@outlook.com>
Date: Wed, 10 Jul 2019 13:00:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CLEditor/windows/ManageTagsWindow.xaml    | 6 +++---
 CLEditor/windows/ManageTagsWindow.xaml.cs | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CLEditor/windows/ManageTagsWindow.xaml b/CLEditor/windows/ManageTagsWindow.xaml
index 7f0ed8f..4d30f34 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml
+++ b/CLEditor/windows/ManageTagsWindow.xaml
@@ -8,10 +8,10 @@
         mc:Ignorable="d"
         Title="管理场景标签" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" Icon="/CLEngine.Editor;component/content/logo_modern.png" Loaded="Window_Loaded" >
     <Grid Background="{DynamicResource BackgroundBrush}" Height="270" Width="466">
-        <Label Content="标签:" HorizontalAlignment="Left" Margin="13,10,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" FontWeight="Bold"/>
+        <Label Content="标签:" HorizontalAlignment="Left" Margin="13,10,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
         <ListBox x:Name="TagsListBox"  HorizontalAlignment="Left" Height="191" Margin="17,36,0,0" VerticalAlignment="Top" Width="423" Style="{DynamicResource ListBoxStyle}"/>
 
-        <xctk:WatermarkTextBox x:Name="addBtn" BorderThickness="1" BorderBrush="#1e1e1e" Watermark="添加新标签" Foreground="#e6e6e6" Background="#4c4c4c" Margin="17,236,234,10" KeyDown="addBtn_KeyDown" >
+        <xctk:WatermarkTextBox x:Name="AddTextBox" BorderThickness="1" BorderBrush="#1e1e1e" Watermark="添加新标签" Foreground="#e6e6e6" Background="#4c4c4c" Margin="17,236,234,10" KeyDown="AddTextBox_KeyDown" >
             <!--SelectAllOnGotFocus="True">-->
             <xctk:WatermarkTextBox.WatermarkTemplate>
                 <DataTemplate>
@@ -19,7 +19,7 @@
                 </DataTemplate>
             </xctk:WatermarkTextBox.WatermarkTemplate>
         </xctk:WatermarkTextBox>
-        <Button x:Name="EnterBtn" Content="添加" HorizontalAlignment="Left" Margin="250,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="EnterBtn_Click"/>
+        <Button x:Name="AddBtn" Content="添加" HorizontalAlignment="Left" Margin="250,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="AddBtn_Click"/>
         <Button x:Name="removeBtn" Content="移除" HorizontalAlignment="Left" Margin="351,234,0,0" VerticalAlignment="Top" Width="89" Style="{DynamicResource ButtonStyle}" Click="removeBtn_Click"/>
     </Grid>
 </Window>
diff --git a/CLEditor/windows/ManageTagsWindow.xaml.cs b/CLEditor/windows/ManageTagsWindow.xaml.cs
index 37de4b2..5d9766e 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml.cs
+++ b/CLEditor/windows/ManageTagsWindow.xaml.cs
@@ -20,7 +20,7 @@ namespace CLEngine.Editor.windows
             this.refreshList();
         }
 
-        private void addBtn_KeyDown(object sender, KeyEventArgs e)
+        private void AddTextBox_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {
@@ -55,15 +55,15 @@ namespace CLEngine.Editor.windows
             }
         }
 
-        private void EnterBtn_Click(object sender, RoutedEventArgs e)
+        private void AddBtn_Click(object sender, RoutedEventArgs e)
         {
-            string text = this.addBtn.Text.Trim();
+            string text = this.AddTextBox.Text.Trim();
             if (text.Equals(string.Empty)) return;
 
             if (!SceneManager.ActiveScene.CommonTags.Contains(text))
                 SceneManager.ActiveScene.CommonTags.Add(text);
 
-            addBtn.Text = "";
+            AddTextBox.Text = "";
 
             this.refreshList();
         }
-- 
Gitee