Merge pull request #280 from mono/textfield

CCTextField implemenation
mono · Aug 7, 2015 · 816ff87 · 816ff87
2 parents 9cee316 + 5aa8810
commit 816ff87
Show file tree

Hide file tree

Showing 64 changed files with 5,460 additions and 248 deletions.
diff --git a/TestWin8Phone/TestWin8Phone.csproj b/TestWin8Phone/TestWin8Phone.csproj
@@ -1208,6 +1208,9 @@
     <Compile Include="..\tests\tests\classes\tests\SpriteTest\SpriteZVertex.cs">
       <Link>classes\tests\SpriteTest\SpriteZVertex</Link>
     </Compile>
+    <Compile Include="..\tests\tests\classes\tests\TextInputTest\CustomIME\UppercaseIMEKeyboardImpl.cs">
+      <Link>classes\tests\TextInputTest\UppercaseIMEKeyboardImpl.cs</Link>
+    </Compile>
     <Compile Include="..\tests\tests\classes\tests\TextInputTest\TextInputTest.cs">
       <Link>classes\tests\TextInputTest\TextInputTest</Link>
     </Compile>

diff --git a/src/CocosSharp.Android.csproj b/src/CocosSharp.Android.csproj
@@ -298,10 +298,9 @@
     <Compile Include="textures\CCTexture2D.cs" />
     <Compile Include="textures\CCTextureAtlas.cs" />
     <Compile Include="textures\CCTextureCache.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
     <Compile Include="text_input_node\CCIMEKeyboardNotificationInfo.cs" />
-    <Compile Include="text_input_node\CCTextFieldTTF.cs" />
     <Compile Include="text_input_node\ICCIMEDelegate.cs" />
-    <Compile Include="text_input_node\ICCTextFieldDelegate.cs" />
     <Compile Include="tileMap_parallax_nodes\CCParallaxNode.cs" />
     <Compile Include="tileMap_parallax_nodes\CCPointObject.cs" />
     <Compile Include="support\Converters\CCPointConverter.cs" />
@@ -354,6 +353,8 @@
     <Compile Include="Renderer\RenderCommands\CCQuadCommand.cs" />
     <Compile Include="Renderer\RenderCommands\CCRenderCommand.cs" />
     <Compile Include="misc_nodes\CCGeometryNode.cs" />
+    <Compile Include="platform\Keyboard\Android\IMEKeyboardImpl.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -385,4 +386,5 @@
   <ItemGroup />
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup />
 </Project>
diff --git a/src/CocosSharp.MacOS.csproj b/src/CocosSharp.MacOS.csproj
@@ -418,6 +418,9 @@
     <Compile Include="Renderer\RenderCommands\CCCustomCommand.cs" />
     <Compile Include="misc_nodes\CCGeometryNode.cs" />
     <Compile Include="denshion\CCEffectPlayer.MonoGame.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
+    <Compile Include="Platform\Keyboard\MacOSX\IMEKeyboardImpl.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="support\Converters\" />
@@ -426,6 +429,7 @@
     <Folder Include="physics\" />
     <Folder Include="Renderer\" />
     <Folder Include="Renderer\RenderCommands\" />
+    <Folder Include="Platform\Keyboard\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">

diff --git a/src/CocosSharp.WP8.csproj b/src/CocosSharp.WP8.csproj
@@ -118,6 +118,7 @@
     <Compile Include="misc_nodes\CCGeometryNode.cs" />
     <Compile Include="misc_nodes\CCNodeGrid.cs" />
     <Compile Include="particle_nodes\CCParticleSystemCache.cs" />
+    <Compile Include="platform\Keyboard\Windows\IMEKeyboardImpl.cs" />
     <Compile Include="Renderer\CCRenderer.cs" />
     <Compile Include="Renderer\RenderCommands\CCCustomCommand.cs" />
     <Compile Include="Renderer\RenderCommands\CCQuadCommand.cs" />
@@ -414,10 +415,10 @@
     <Compile Include="textures\CCTextureAtlas.cs" />
     <Compile Include="textures\CCTextureCache.cs" />
     <Compile Include="textures\CCTexture2D.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
     <Compile Include="text_input_node\ICCIMEDelegate.cs" />
     <Compile Include="text_input_node\CCIMEKeyboardNotificationInfo.cs" />
-    <Compile Include="text_input_node\CCTextFieldTTF.cs" />
-    <Compile Include="text_input_node\ICCTextFieldDelegate.cs" />
     <Compile Include="tileMap_parallax_nodes\CCParallaxNode.cs" />
     <Compile Include="tileMap_parallax_nodes\CCPointObject.cs" />
     <Compile Include="tileMap_parallax_nodes\CCTileLayerInfo.cs" />

diff --git a/src/CocosSharp.WinRT.csproj b/src/CocosSharp.WinRT.csproj
@@ -111,6 +111,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="platform\Keyboard\Windows\WinRT\IMEKeyboardImpl.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
     <None Include="label_nodes\CCLabel-Gdi.cs" />
     <Compile Include="actions\action\CCAmplitudeAction.cs" />
     <Compile Include="events\CCEvent.cs" />
@@ -888,15 +891,9 @@
     <Compile Include=".\text_input_node\CCIMEKeyboardNotificationInfo.cs">
       <LogicalName>text_input_node\CCIMEKeyboardNotificationInfo</LogicalName>
     </Compile>
-    <Compile Include=".\text_input_node\CCTextFieldTTF.cs">
-      <LogicalName>text_input_node\CCTextFieldTTF </LogicalName>
-    </Compile>
     <Compile Include=".\text_input_node\ICCIMEDelegate.cs">
       <LogicalName>text_input_node\ICCIMEDelegate</LogicalName>
     </Compile>
-    <Compile Include=".\text_input_node\ICCTextFieldDelegate.cs">
-      <LogicalName>text_input_node\ICCTextFieldDelegate</LogicalName>
-    </Compile>
     <Compile Include=".\tileMap_parallax_nodes\CCParallaxNode.cs">
       <LogicalName>tileMap_parallax_nodes\CCParallaxNode</LogicalName>
     </Compile>

diff --git a/src/CocosSharp.WindowsDX.csproj b/src/CocosSharp.WindowsDX.csproj
@@ -199,6 +199,7 @@
     <Compile Include="physics\chipmunk\*.cs" Condition=" '$(Configuration)' == 'DebugPhysics' Or '$(Configuration)' == 'ReleasePhysics' " />
     <Compile Include="physics\extensions\*.cs" Condition=" '$(Configuration)' == 'DebugPhysics' Or '$(Configuration)' == 'ReleasePhysics' " />
     <Compile Include="platform\CCArrayPool.cs" />
+    <Compile Include="platform\Keyboard\Windows\IMEKeyboardImpl.cs" />
     <Compile Include="Renderer\CCRenderer.cs" />
     <Compile Include="Renderer\RenderCommands\CCCustomCommand.cs" />
     <Compile Include="Renderer\RenderCommands\CCQuadCommand.cs" />
@@ -458,10 +459,10 @@
     <Compile Include="textures\CCTextureAtlas.cs" />
     <Compile Include="textures\CCTextureCache.cs" />
     <Compile Include="textures\CCTexture2D.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
     <Compile Include="text_input_node\ICCIMEDelegate.cs" />
     <Compile Include="text_input_node\CCIMEKeyboardNotificationInfo.cs" />
-    <Compile Include="text_input_node\CCTextFieldTTF.cs" />
-    <Compile Include="text_input_node\ICCTextFieldDelegate.cs" />
     <Compile Include="tileMap_parallax_nodes\CCParallaxNode.cs" />
     <Compile Include="tileMap_parallax_nodes\CCPointObject.cs" />
     <Compile Include="tileMap_parallax_nodes\CCTileLayerInfo.cs" />
@@ -497,6 +498,7 @@
       <Name>ChipmunkSharp.Win32</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/CocosSharp.WindowsGL.csproj b/src/CocosSharp.WindowsGL.csproj
@@ -142,6 +142,7 @@
     <Compile Include="label_nodes\CCTextLayout.cs" />
     <Compile Include="misc_nodes\CCGeometryNode.cs" />
     <Compile Include="misc_nodes\CCNodeGrid.cs" />
+    <Compile Include="platform\Keyboard\Windows\IMEKeyboardImpl.cs" />
     <Compile Include="Renderer\CCRenderer.cs" />
     <Compile Include="Renderer\RenderCommands\CCCustomCommand.cs" />
     <Compile Include="Renderer\RenderCommands\CCQuadCommand.cs" />
@@ -404,10 +405,10 @@
     <Compile Include="textures\CCTextureAtlas.cs" />
     <Compile Include="textures\CCTextureCache.cs" />
     <Compile Include="textures\CCTexture2D.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
     <Compile Include="text_input_node\ICCIMEDelegate.cs" />
     <Compile Include="text_input_node\CCIMEKeyboardNotificationInfo.cs" />
-    <Compile Include="text_input_node\CCTextFieldTTF.cs" />
-    <Compile Include="text_input_node\ICCTextFieldDelegate.cs" />
     <Compile Include="tileMap_parallax_nodes\CCParallaxNode.cs" />
     <Compile Include="tileMap_parallax_nodes\CCPointObject.cs" />
     <Compile Include="tileMap_parallax_nodes\CCTileLayerInfo.cs" />

diff --git a/src/CocosSharp.WindowsPhone81.csproj b/src/CocosSharp.WindowsPhone81.csproj
@@ -399,10 +399,11 @@
     <Compile Include="textures\CCTextureAtlas.cs" />
     <Compile Include="textures\CCTextureCache.cs" />
     <Compile Include="textures\CCTexture2D.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
     <Compile Include="text_input_node\ICCIMEDelegate.cs" />
     <Compile Include="text_input_node\CCIMEKeyboardNotificationInfo.cs" />
-    <Compile Include="text_input_node\CCTextFieldTTF.cs" />
-    <Compile Include="text_input_node\ICCTextFieldDelegate.cs" />
+    <Compile Include="platform\Keyboard\Windows\wp81\IMEKeyboardImpl.cs" />
     <Compile Include="tileMap_parallax_nodes\CCParallaxNode.cs" />
     <Compile Include="tileMap_parallax_nodes\CCPointObject.cs" />
     <Compile Include="tileMap_parallax_nodes\CCTileLayerInfo.cs" />
@@ -418,6 +419,7 @@
     <Compile Include="Win8IOExtensions.cs" />
     <Compile Include="Win8StoreIOUtility.cs" />
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/src/CocosSharp.iOS.csproj b/src/CocosSharp.iOS.csproj
@@ -311,9 +311,7 @@
     <Compile Include="textures\CCTextureAtlas.cs" />
     <Compile Include="textures\CCTextureCache.cs" />
     <Compile Include="text_input_node\CCIMEKeyboardNotificationInfo.cs" />
-    <Compile Include="text_input_node\CCTextFieldTTF.cs" />
     <Compile Include="text_input_node\ICCIMEDelegate.cs" />
-    <Compile Include="text_input_node\ICCTextFieldDelegate.cs" />
     <Compile Include="tileMap_parallax_nodes\CCParallaxNode.cs" />
     <Compile Include="tileMap_parallax_nodes\CCPointObject.cs" />
     <Compile Include="Platform\CCFocusManager.cs" />
@@ -401,6 +399,9 @@
     <Compile Include="Renderer\RenderCommands\CCRenderCommand.cs" />
     <Compile Include="misc_nodes\CCGeometryNode.cs" />
     <Compile Include="denshion\CCEffectPlayer.MonoGame.cs" />
+    <Compile Include="text_input_node\CCTextField.cs" />
+    <Compile Include="Platform\Keyboard\IOS\IMEKeyboardImpl.cs" />
+    <Compile Include="text_input_node\CCIMEKeyboardEventArgs.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
@@ -425,4 +426,5 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup />
 </Project>