Merge branch 'CefSharp1' of github.com:shen6041/CefSharp into shen604…

…1-CefSharp1, so we can work towards closing #211.
cefsharp · Jan 21, 2014 · c25d8ba · c25d8ba
2 parents 3b076d1 + b121f93
commit c25d8ba
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 18 deletions.
diff --git a/CefSharp.Wpf/WebView.cpp b/CefSharp.Wpf/WebView.cpp
@@ -184,24 +184,42 @@ namespace CefSharp
 
         void WebView::OnPreviewKey(KeyEventArgs^ e)
         {
-            CefRefPtr<CefBrowser> browser;
-            if (!TryGetCefBrowser(browser))
-            {
-                return;
-            }
-
-            if (e->Key == Key::Tab ||
-                e->Key >= Key::Left && e->Key <= Key::Down)
-            {
-                CefBrowser::KeyType type = e->IsDown ? KT_KEYDOWN : KT_KEYUP;
-                CefKeyInfo keyInfo;
-                keyInfo.key = KeyInterop::VirtualKeyFromKey(e->Key);
-                browser->SendKeyEvent(type, keyInfo, 0);
-
-                e->Handled = true;
-            }
-        }
-
+           CefRefPtr<CefBrowser> browser;
+           if (!TryGetCefBrowser(browser))
+           {
+               return;
+           }
+
+           if (e->Key == Key::Tab ||e->Key >= Key::Left && e->Key <= Key::Down)
+           {
+               CefBrowser::KeyType type = e->IsDown ? KT_KEYDOWN : KT_KEYUP;
+               CefKeyInfo keyInfo;
+               keyInfo.key = KeyInterop::VirtualKeyFromKey(e->Key);
+               browser->SendKeyEvent(type, keyInfo, 0);
+
+               e->Handled = true;
+           }
+        }
+
+        void WebView::OnPreviewTextInput(TextCompositionEventArgs^ e)
+	{
+		CefRefPtr<CefBrowser> browser;
+		if (!TryGetCefBrowser(browser))
+		{
+			return;
+		}
+
+		CefBrowser::KeyType type;
+		for (int i = 0;i<e->Text->Length;i++)
+		{
+			CefKeyInfo keyInfo;
+			keyInfo.key =(int)e->Text[i];
+			type = KT_CHAR; 
+			browser->SendKeyEvent(type, keyInfo, 0);
+		}
+		e->Handled = true;
+		}
+
         void WebView::OnMouseButton(MouseButtonEventArgs^ e)
         {
             CefRefPtr<CefBrowser> browser;

diff --git a/CefSharp.Wpf/WebView.h b/CefSharp.Wpf/WebView.h
@@ -103,6 +103,7 @@ namespace CefSharp
             virtual void OnLostFocus(RoutedEventArgs^ e) override;
             virtual void OnPreviewKeyDown(KeyEventArgs^ e) override;
             virtual void OnPreviewKeyUp(KeyEventArgs^ e) override;
+            virtual void OnPreviewTextInput(TextCompositionEventArgs^ e) override;
 
             virtual void OnMouseMove(MouseEventArgs^ e) override;
             virtual void OnMouseWheel(MouseWheelEventArgs^ e) override;