Merge branch 'BartAdv/master'

sattvik · Mar 28, 2014 · 4895463 · 4895463
2 parents 59bcad6 + 11d7f84
commit 4895463
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/clojure/neko/ui/mapping.clj b/src/clojure/neko/ui/mapping.clj
@@ -49,7 +49,7 @@
                 :inherits :view
                 :value-namespaces
                 {:ellipsize android.text.TextUtils$TruncateAt}
-                :traits [:text :text-size]}
+                :traits [:text :text-size :on-editor-action]}
     :list-view {:classname android.widget.ListView
                 :inherits :view-group}
     :search-view {:classname android.widget.SearchView

diff --git a/src/clojure/neko/ui/traits.clj b/src/clojure/neko/ui/traits.clj
@@ -15,6 +15,7 @@
             [neko.resource :as res]
             [neko.context :as context]
             [neko.listeners.view :as view-listeners]
+            [neko.listeners.text-view :as text-view-listeners]
             neko.listeners.search-view)
   (:use [neko.-utils :only [memoized]])
   (:import [android.widget LinearLayout$LayoutParams TextView SearchView
@@ -396,6 +397,13 @@ next-level elements."
           (fn [q] (on-query-text-submit q menu-item))
           on-query-text-submit))))
 
+(deftrait :on-editor-action
+  "Takes :on-editor-action attribute, which should be function
+  of three arguments, and sets it as OnEditorAction for the
+  TexView widget"
+  [^TextView wdg, {:keys [on-editor-action]}]
+  (.setOnEditorActionListener wdg (text-view-listeners/on-editor-action-call on-editor-action)))
+
 ;; ### ID storing traits
 
 (deftrait :id-holder