Modified to change input_mode only if the handler returns true

Change-Id: Ib546f0013fa60dea9562de7c297e109f0983c3d1

diff --git a/scl/scleventhandler.cpp b/scl/scleventhandler.cpp
index f433e9b..b9cb5b0 100644 (file)
--- a/scl/scleventhandler.cpp
+++ b/scl/scleventhandler.cpp
@@ -253,9 +253,7 @@ CSCLEventHandler::set_input_mode(const sclchar *input_mode)
             }
         }
 
-        if (m_cur_input_mode_event_callback) {
-            ret = TRUE;
-        }
+        ret = TRUE;
     }
 
     return ret;

diff --git a/scl/scluiimpl.cpp b/scl/scluiimpl.cpp
index 28c4af0..4b390db 100644 (file)
--- a/scl/scluiimpl.cpp
+++ b/scl/scluiimpl.cpp
@@ -207,10 +207,11 @@ CSCLUIImpl::set_input_mode(const sclchar *input_mode)
         }
 
         if (controller && windows && handler && focus_handler && mode != NOT_USED) {
-            handler->set_input_mode(input_mode);
-            ret = controller->process_input_mode_change(mode);
-            windows->update_window(windows->get_base_window());
-            focus_handler->init_key_index();
+            if (handler->set_input_mode(input_mode)) {
+                ret = controller->process_input_mode_change(mode);
+                windows->update_window(windows->get_base_window());
+                focus_handler->init_key_index();
+            }
         }
     }