From b95581b63cab6b54cfe9fbb7181b544b60652c7c Mon Sep 17 00:00:00 2001
From: Kaniu Tayou <1056879522@qq.com>
Date: Sat, 29 Dec 2018 08:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stormchat-client-csharp/StormChatWPF/Chat.cs  |  2 +-
 .../StormChatWPF/MainWindow.xaml              |  4 +--
 .../StormChatWPF/MainWindow.xaml.cs           |  2 +-
 .../StormChatWPF/StormChatWPF.csproj          |  7 +++++
 .../StormChatWPF/UI/Contacts.xaml             | 14 +++++-----
 .../StormChatWPF/UI/ContactsInfo.cs           |  1 +
 .../StormChatWPF/UI/UserMeHeadInfo.xaml       | 17 ++++++++++++
 .../StormChatWPF/UI/UserMeHeadInfo.xaml.cs    | 27 +++++++++++++++++++
 8 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml
 create mode 100644 stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml.cs

diff --git a/stormchat-client-csharp/StormChatWPF/Chat.cs b/stormchat-client-csharp/StormChatWPF/Chat.cs
index 7c36c87..9ab9a3f 100644
--- a/stormchat-client-csharp/StormChatWPF/Chat.cs
+++ b/stormchat-client-csharp/StormChatWPF/Chat.cs
@@ -19,7 +19,7 @@ namespace StormChatWPF
             StormClient.OnLoginDone += OnHaveLogin;
             StormClient.OnGetUserListDone += OnGetContactsList;
             StormClient.OnMessage +=OnMessage;//事件挂接
-            User.DefaultPhoto = new MemoryStream(File.ReadAllBytes(@"../../UI/Resources/默认头像.png"));
+            User.DefaultPhoto = new MemoryStream(File.ReadAllBytes(@"../../UI/Resources/默认头像.png"));//设定默认头像
         }
         internal static User CurrentContact { get; set; }//设置当前联系人对象
         /// <summary>
diff --git a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml
index f13788d..284cfc3 100644
--- a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml
+++ b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml
@@ -19,9 +19,9 @@
 			<ColumnDefinition Width="200*"/>
 			<ColumnDefinition Width="200*"/>
 		</Grid.ColumnDefinitions>
-		<ListView x:Name="UsersList" Margin="0,0,0,0" IsEnabled="True" SelectionChanged="UsersList_SelectionChanged" Grid.Row="1" Grid.RowSpan="2">
+		<ListView x:Name="UsersList" Margin="0,0,0,0" IsEnabled="True" SelectionChanged="UsersList_SelectionChanged" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Left" Width="198">
 		</ListView>
-		<TextBox x:Name="InputBox" Margin="0,0,0,0" TextWrapping="Wrap" Text="" Grid.Row="2" Grid.ColumnSpan="3" Grid.Column="1" />
+		<TextBox x:Name="InputBox" Margin="200,0,0,0" TextWrapping="Wrap" Text="" Grid.Row="2" Grid.ColumnSpan="4" />
 		<Button Content="Send" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Bottom" Width="75" Click="Button_Click" Height="20" Grid.Row="2" Grid.Column="3"/>
 		<ScrollViewer Grid.ColumnSpan="3" Grid.Column="1" Margin="0,0,0,0" Grid.Row="1" >
 			<ScrollViewer.Content>
diff --git a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs
index 4053648..843ec3b 100644
--- a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs
+++ b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs
@@ -8,7 +8,7 @@ using System.Windows.Controls;
 namespace StormChatWPF
 {
     /// <summary>
-    /// UserWindow.xaml 的交互逻辑
+    /// MainWindow.xaml 的交互逻辑
     /// </summary>
     public partial class MainWindow : Window
     {
diff --git a/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj b/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj
index b8c6c14..22097bf 100644
--- a/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj
+++ b/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj
@@ -70,6 +70,9 @@
       <DependentUpon>Contacts.xaml</DependentUpon>
     </Compile>
     <Compile Include="UI\ContactsInfo.cs" />
+    <Compile Include="UI\UserMeHeadInfo.xaml.cs">
+      <DependentUpon>UserMeHeadInfo.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Window1.xaml.cs">
       <DependentUpon>Window1.xaml</DependentUpon>
     </Compile>
@@ -93,6 +96,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\UserMeHeadInfo.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Window1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml b/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml
index 9319f29..ac40888 100644
--- a/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml
+++ b/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml
@@ -5,13 +5,13 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:StormChatWPF.UI"
              mc:Ignorable="d" 
-             d:DesignHeight="40" d:DesignWidth="120" HorizontalAlignment="Stretch">
+             d:DesignHeight="40" d:DesignWidth="120">
 	<Grid>
-		<WrapPanel Height="40" VerticalAlignment="Stretch">
-			<Image x:Name="HeadPicture" HorizontalAlignment="Left" Height="40"  Width="40"/>
-			<Label x:Name="text" Content="Label" Height="40" FontSize="14"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Center"/>
-		</WrapPanel>
-
-
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="40*"/>
+			<ColumnDefinition Width="80*"/>
+		</Grid.ColumnDefinitions>
+		<Image x:Name="HeadPicture" HorizontalAlignment="Left" Height="40"  Width="40"/>
+		<Label x:Name="text" Content="Label" Height="40" FontSize="14"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Right" Grid.Column="1" Width="80"/>
 	</Grid>
 </UserControl>
diff --git a/stormchat-client-csharp/StormChatWPF/UI/ContactsInfo.cs b/stormchat-client-csharp/StormChatWPF/UI/ContactsInfo.cs
index 07fefd8..3359679 100644
--- a/stormchat-client-csharp/StormChatWPF/UI/ContactsInfo.cs
+++ b/stormchat-client-csharp/StormChatWPF/UI/ContactsInfo.cs
@@ -14,6 +14,7 @@ namespace StormChatWPF.UI
             image.EndInit();
             HeadPicture.Source = image;
             text.Content = user.NickName;
+            Width = 120;
         }
         BitmapImage image = new BitmapImage();
     }
diff --git a/stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml b/stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml
new file mode 100644
index 0000000..b0e8217
--- /dev/null
+++ b/stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="StormChatWPF.UI.UserMeHeadInfo"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:StormChatWPF.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="60" d:DesignWidth="200">
+	<Grid>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="60*"/>
+			<ColumnDefinition Width="120*"/>
+		</Grid.ColumnDefinitions>
+		<Image x:Name="image" Height="60" Margin="0,0,0,0" VerticalAlignment="Top"/>
+		
+	</Grid>
+</UserControl>
diff --git a/stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml.cs b/stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml.cs
new file mode 100644
index 0000000..533a0b7
--- /dev/null
+++ b/stormchat-client-csharp/StormChatWPF/UI/UserMeHeadInfo.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace StormChatWPF.UI
+{
+    /// <summary>
+    /// UserMeHeadInfo.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserMeHeadInfo : UserControl
+    {
+        public UserMeHeadInfo()
+        {
+            InitializeComponent();
+        }
+    }
+}