Tweaks to UIWebView, editor html

Data/AtomicEditor/CodeEditor/Editor.html

@@ -27,13 +27,19 @@
   <script src="./source/ace/ext-language_tools.js"></script>
   <script>
 
-  var editor;
+  editor = ace.edit("editor");
+
+  editor.setOptions({
+    enableBasicAutocompletion: true,
+    enableSnippets: true,
+    enableLiveAutocompletion: true
+  });
 
   function saveCode() {
 
     var data = {
         message : "saveCode",
-        payload : editor.getValue()
+        payload : editor.session.getValue()
     }
 
     window.atomicQuery({request: JSON.stringify(data),
@@ -44,18 +50,10 @@
 
   function codeLoaded(value) {
 
-    editor = ace.edit("editor");
-
-    editor.setOptions({
-      enableBasicAutocompletion: true,
-      enableSnippets: true,
-      enableLiveAutocompletion: true
-    });
-
     editor.setTheme("ace/theme/monokai");
     editor.session.setMode("ace/mode/typescript");
-
-    editor.setValue(value);
+    editor.session.setValue(value);
+    editor.gotoLine(0);
 
     editor.getSession().on('change', function(e) {
       window.atomicQuery({request: 'change',

Source/AtomicWebView/UIWebView.cpp

@@ -199,72 +199,6 @@ void UIWebView::HandleTextInput(StringHash eventType, VariantMap& eventData)
 
 }
 
-bool UIWebView::HandleKeyEvent(const TBWidgetEvent &ev, bool keyDown)
-{
-
-#ifdef ATOMIC_PLATFORM_OSX
-    if (!keyDown)
-        return true;
-#endif
-
-    if (ev.special_key == TB_KEY_UNDEFINED)
-        return true;
-
-    int qual = 0;
-
-    if (ev.modifierkeys & TB_CTRL)
-        qual |= QUAL_CTRL;
-    if (ev.modifierkeys & TB_SHIFT)
-        qual |= QUAL_SHIFT;
-    if (ev.modifierkeys & TB_ALT)
-        qual |= QUAL_ALT;
-
-    int scanCode = SDL_SCANCODE_UNKNOWN;
-
-    switch (ev.special_key)
-    {
-    case TB_KEY_UP:
-        scanCode = SDL_SCANCODE_UP;
-        break;
-    case TB_KEY_DOWN:
-        scanCode = SDL_SCANCODE_DOWN;
-        break;
-    case TB_KEY_RIGHT:
-        scanCode = SDL_SCANCODE_RIGHT;
-        break;
-    case TB_KEY_LEFT:
-        scanCode = SDL_SCANCODE_LEFT;
-        break;
-    case TB_KEY_ENTER:
-        scanCode = SDL_SCANCODE_RETURN;
-        break;
-    case TB_KEY_DELETE:
-    case TB_KEY_BACKSPACE:
-        scanCode = SDL_SCANCODE_BACKSPACE;
-        break;
-    default:
-        break;
-    }
-
-    if (scanCode == SDL_SCANCODE_UNKNOWN)
-        return true;
-
-    //webClient_->SendKeyEvent(scanCode, qual, !keyDown);
-
-    return true;
-
-    /*
-    TB_KEY_UNDEFINED = 0,
-    TB_KEY_UP, TB_KEY_DOWN, TB_KEY_LEFT, TB_KEY_RIGHT,
-    TB_KEY_PAGE_UP, TB_KEY_PAGE_DOWN, TB_KEY_HOME, TB_KEY_END,
-    TB_KEY_TAB, TB_KEY_BACKSPACE, TB_KEY_INSERT, TB_KEY_DELETE,
-    TB_KEY_ENTER, TB_KEY_ESC,
-    TB_KEY_F1, TB_KEY_F2, TB_KEY_F3, TB_KEY_F4, TB_KEY_F5, TB_KEY_F6,
-    TB_KEY_F7, TB_KEY_F8, TB_KEY_F9, TB_KEY_F10, TB_KEY_F11, TB_KEY_F12
-    */
-
-}
-
 bool UIWebView::OnEvent(const TBWidgetEvent &ev)
 {
     if (ev.type == EVENT_TYPE_POINTER_DOWN || ev.type == EVENT_TYPE_POINTER_UP)
@@ -282,14 +216,6 @@ bool UIWebView::OnEvent(const TBWidgetEvent &ev)
         webClient_->SendMouseWheelEvent(ev.target_x, ev.target_y, 0, ev.delta_x, ev.delta_y);
         return true;
     }
-    else if (ev.type == EVENT_TYPE_KEY_DOWN)
-    {
-        return HandleKeyEvent(ev, true);
-    }
-    else if (ev.type == EVENT_TYPE_KEY_UP)
-    {
-        return HandleKeyEvent(ev, false);
-    }
     else if (ev.type == EVENT_TYPE_SHORTCUT)
     {
         if (ev.ref_id == TBIDC("copy"))

Source/AtomicWebView/UIWebView.h

@@ -54,9 +54,6 @@ protected:
 
     bool OnEvent(const tb::TBWidgetEvent &ev);
     void OnFocusChanged(bool focused);
-    bool HandleKeyEvent(const tb::TBWidgetEvent &ev, bool keyDown);
-
-
 
 private:
 

Source/AtomicWebView/WebClient.cpp

@@ -485,6 +485,9 @@ void WebClient::SendKeyEvent(const StringHash eventType, VariantMap& eventData)
     // return does not work at all on cef client with offscreen
     // bad interaction with arrow keys (for example here, after
     // hitting arrow keys, return/text takes a couple presses to register
+
+    memset((void*)&keyEvent, 0, sizeof(keyEvent));
+
     if (eventType == "KeyDown")
         keyEvent.type = KEYEVENT_KEYDOWN;
     else
@@ -691,7 +694,9 @@ void WebClient::WasResized()
 
 bool WebClient::CreateBrowser(const String& initialURL, int width, int height)
 {
-    return d_->CreateBrowser(initialURL, width, height);
+    bool result = d_->CreateBrowser(initialURL, width, height);
+
+    return result;
 }
 
 void WebClient::SetSize(int width, int height)

Source/AtomicWebView/WebKeyboardMac.cpp

@@ -86,9 +86,10 @@ bool ConvertKeyEvent(Input* input, const StringHash eventType, VariantMap& event
     {
         keyEvent.native_key_code = darwinScanCode;
         keyEvent.type = wk.keyDown ? KEYEVENT_KEYDOWN : KEYEVENT_KEYUP;
+        return true;
     }
 
-    return true;
+    return false;
 }
 
 bool ConvertTextInputEvent(StringHash eventType, VariantMap& eventData, CefKeyEvent& keyEvent)