/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/input-method-devel.h>
#include <dali/integration-api/adaptor.h>
#include <dali/internal/system/common/locale-utils.h>
#include <dali/internal/window-system/tizen-wayland/window-render-surface-ecore-wl.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/system/common/singleton-service-impl.h>
+#include <dali/public-api/adaptor-framework/input-method.h>
#define TOKEN_STRING(x) #x
else if ( Adaptor::IsAvailable() )
{
// Create instance and register singleton only if the adaptor is available
-
Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) );
Any nativeWindow = adaptorImpl.GetNativeWindowHandle();
ImfManagerEcoreWl::~ImfManagerEcoreWl()
{
- DisconnectCallbacks();
+ Finalize();
+ ecore_imf_shutdown();
+}
+void ImfManagerEcoreWl::Finalize()
+{
+ DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::Finalize\n" );
+ DisconnectCallbacks();
DeleteContext();
- ecore_imf_shutdown();
}
void ImfManagerEcoreWl::CreateContext( Ecore_Wl_Window *ecoreWlwin )
{
ecore_imf_context_input_panel_layout_set( mIMFContext, panelLayoutMap[index] );
}
- if ( mOptions.CompareAndSet(AUTO_CAPITALISE, options, index) )
+ if ( mOptions.CompareAndSet(BUTTON_ACTION, options, index) )
{
- ecore_imf_context_autocapital_type_set( mIMFContext, autoCapitalMap[index] );
+ ecore_imf_context_input_panel_return_key_type_set( mIMFContext, returnKeyTypeMap[index] );
}
- if ( mOptions.CompareAndSet(ACTION_BUTTON_TITLE, options, index) )
+ if ( mOptions.CompareAndSet(AUTO_CAPITALIZE, options, index) )
{
- ecore_imf_context_input_panel_return_key_type_set( mIMFContext, returnKeyTypeMap[index] );
+ ecore_imf_context_autocapital_type_set( mIMFContext, autoCapitalMap[index] );
}
if ( mOptions.CompareAndSet(VARIATION, options, index) )
{
} // Dali
-#pragma GCC diagnostic pop
\ No newline at end of file
+#pragma GCC diagnostic pop