enable vertical scrolling

kerryjiang · Dec 22, 2014 · 2474f76 · 2474f76
1 parent 347e685
commit 2474f76
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 15 deletions.
diff --git a/Management/AgentClient.SL5/SuperSocket.ServerManager.Client.SL5.csproj b/Management/AgentClient.SL5/SuperSocket.ServerManager.Client.SL5.csproj
@@ -82,11 +82,11 @@
     <Reference Include="System.Windows.Controls.Data, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Windows.Browser" />
     <Reference Include="System.Windows.Controls.Input.Toolkit">
-	   <HintPath>..\..\Reference\SilverlightToolkit\50\System.Windows.Controls.Input.Toolkit.dll</HintPath>
-	</Reference>
+      <HintPath>..\..\Reference\SilverlightToolkit\50\System.Windows.Controls.Input.Toolkit.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity">
-	   <HintPath>..\..\Reference\Blend\sl50\System.Windows.Controls.Input.Toolkit.dll</HintPath>
-	</Reference>
+      <HintPath>..\..\Reference\Blend\sl50\System.Windows.Controls.Input.Toolkit.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Serialization, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="WebSocket4Net">

diff --git a/Management/AgentClient.WPF/MainPanel.xaml b/Management/AgentClient.WPF/MainPanel.xaml
@@ -38,16 +38,19 @@
                        Fill="#FFDACEEC" Height="5" VerticalAlignment="Bottom"></Rectangle>
         </Grid>
         <Border Grid.Row="1" VerticalAlignment="Stretch" Background="AliceBlue">
-            <ItemsControl
+            <ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ItemsControl
                       ItemsSource="{Binding Nodes}"
                       ItemTemplate="{StaticResource NodeContainerTemplate}">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Vertical">
-                        </StackPanel>
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-            </ItemsControl>
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Vertical">
+                            </StackPanel>
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                </ItemsControl>
+            </ScrollViewer>
         </Border>
     </Grid>
 </UserControl>
diff --git a/Management/SuperSocket.ServerManager.Net45.sln b/Management/SuperSocket.ServerManager.Net45.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BEAF6CBD-16DD-456B-A889-421E0DFAB783}"
 	ProjectSection(SolutionItems) = preProject
 		..\Solution Items\GlobalAssemblyInfo.cs = ..\Solution Items\GlobalAssemblyInfo.cs
@@ -34,52 +36,122 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.WebSocket.Net45
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.ServerManager.Net45", "Server\SuperSocket.ServerManager.Net45.csproj", "{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.ServerManager.Client.SL5", "AgentClient.SL5\SuperSocket.ServerManager.Client.SL5.csproj", "{BF5E608C-6216-41C3-86AA-E6380B0A8888}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.ServerManager.Client.WPF", "AgentClient.WPF\SuperSocket.ServerManager.Client.WPF.csproj", "{5FF240A5-2C62-4322-A0E1-335A04148603}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|x86.ActiveCfg = Release|Any CPU
 		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|x86.ActiveCfg = Release|Any CPU
 		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.Build.0 = Release|Any CPU
+		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|x86.ActiveCfg = Release|Any CPU
 		{B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9113694-7226-4152-938D-3172B11571A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B9113694-7226-4152-938D-3172B11571A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B9113694-7226-4152-938D-3172B11571A1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9113694-7226-4152-938D-3172B11571A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B9113694-7226-4152-938D-3172B11571A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B9113694-7226-4152-938D-3172B11571A1}.Release|x86.ActiveCfg = Release|Any CPU
 		{01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{01987BAC-C498-44DD-B274-62EA2506B51D}.Release|x86.ActiveCfg = Release|Any CPU
 		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B}.Release|x86.ActiveCfg = Release|Any CPU
 		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{49B6DFF1-D7A6-4BDE-90DB-9053416B0AA5}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BF5E608C-6216-41C3-86AA-E6380B0A8888}.Release|x86.ActiveCfg = Release|Any CPU
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Debug|x86.ActiveCfg = Debug|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Debug|x86.Build.0 = Debug|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Release|Any CPU.ActiveCfg = Release|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Release|Mixed Platforms.Build.0 = Release|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Release|x86.ActiveCfg = Release|x86
+		{5FF240A5-2C62-4322-A0E1-335A04148603}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{FC181BA8-9DE5-444C-899F-9C554BC65629} = {BEAF6CBD-16DD-456B-A889-421E0DFAB783}
+		{ACCCC9EB-6386-44DC-8147-D69751FC6D93} = {BEAF6CBD-16DD-456B-A889-421E0DFAB783}
 		{A24F4D38-BA9C-4FD6-95B7-4980DE36131A} = {4F5A2C5C-7813-4656-BB7B-5A4E9BCFCB26}
 		{40B77789-EA11-4C05-8F52-86711D7BCAAF} = {4F5A2C5C-7813-4656-BB7B-5A4E9BCFCB26}
 		{153FEF72-191C-43D9-BE71-2B351C7AC760} = {4F5A2C5C-7813-4656-BB7B-5A4E9BCFCB26}
 		{B9113694-7226-4152-938D-3172B11571A1} = {4F5A2C5C-7813-4656-BB7B-5A4E9BCFCB26}
 		{01987BAC-C498-44DD-B274-62EA2506B51D} = {4F5A2C5C-7813-4656-BB7B-5A4E9BCFCB26}
 		{DB6DD6E8-ABDE-4C4A-A3E2-DF49C074433B} = {4F5A2C5C-7813-4656-BB7B-5A4E9BCFCB26}
-		{FC181BA8-9DE5-444C-899F-9C554BC65629} = {BEAF6CBD-16DD-456B-A889-421E0DFAB783}
-		{ACCCC9EB-6386-44DC-8147-D69751FC6D93} = {BEAF6CBD-16DD-456B-A889-421E0DFAB783}
 	EndGlobalSection
 EndGlobal