: mEvasPlugin(evasPlugin)
, mEcoreEvas(NULL)
, mImageEvasObject(NULL)
- , mDaliAccessEvasObject(NULL)
+ , mAccessEvasObject(NULL)
, mDaliEvasObject(NULL)
{
Evas* evas = evas_object_evas_get(parentEvasObject);
evas_object_size_hint_align_set(mImageEvasObject, EVAS_HINT_FILL, EVAS_HINT_FILL);
// Register the elm access to image evas object
- mDaliAccessEvasObject = elm_access_object_register(mImageEvasObject, parentEvasObject);
+ mAccessEvasObject = elm_access_object_register(mImageEvasObject, parentEvasObject);
// Create a button and set style as "focus", if does not want to show the focus, then "transparent"
mDaliEvasObject = elm_button_add(parentEvasObject);
// Unregister elm_access_object
elm_access_object_unregister(mImageEvasObject);
- mDaliAccessEvasObject = NULL;
+ mAccessEvasObject = NULL;
// Delete the image evas object
evas_object_del(mImageEvasObject);
EvasPlugin* mEvasPlugin;
Ecore_Evas* mEcoreEvas;
Evas_Object* mImageEvasObject;
- Evas_Object* mDaliAccessEvasObject;
+ Evas_Object* mAccessEvasObject;
Evas_Object* mDaliEvasObject;
};
delete mRenderNotification;
mRenderNotification = NULL;
- // the singleton service should be unregistered before adaptor deletion
- mSingletonService.UnregisterAll();
-
delete mAdaptor;
mAdaptor = NULL;
delete mTBMRenderSurface;
mTBMRenderSurface = NULL;
+ mSingletonService.UnregisterAll();
+
delete mImpl;
mImpl = NULL;
#endif
{
if (!mEvasEventHandler)
{
- mEvasEventHandler = new Extension::Internal::EvasEventHandler(mImpl->mImageEvasObject, mImpl->mDaliAccessEvasObject, mImpl->mDaliEvasObject, *this);
+ mEvasEventHandler = new Extension::Internal::EvasEventHandler(mImpl->mImageEvasObject, mImpl->mAccessEvasObject, mImpl->mDaliEvasObject, *this);
}
// Start the adaptor
mAdaptor->NotifySceneCreated();
mState = RUNNING;
-
- DALI_LOG_RELEASE_INFO("EvasPlugin::Run");
}
#endif
}
mAdaptor->Pause();
mPauseSignal.Emit();
-
- DALI_LOG_RELEASE_INFO("EvasPlugin::Pause");
}
}
mResumeSignal.Emit();
mState = RUNNING;
-
- DALI_LOG_RELEASE_INFO("EvasPlugin::Resume");
}
}
mState = STOPPED;
mTerminateSignal.Emit();
-
- DALI_LOG_RELEASE_INFO("EvasPlugin::Stop");
}
#endif
}
-Evas_Object* EvasPlugin::GetDaliAccessEvasObject()
+Evas_Object* EvasPlugin::GetAccessEvasObject()
{
- return mImpl->mDaliAccessEvasObject;
+ return mImpl->mAccessEvasObject;
}
Evas_Object* EvasPlugin::GetDaliEvasObject()
void EvasPlugin::OnEvasObjectResize(const Rect<int>& geometry)
{
- DALI_LOG_RELEASE_INFO("EvasPlugin::OnEvasObjectResize (%d x %d)", geometry.width, geometry.height);
-
if (geometry.width <= 1 || geometry.height <= 1)
{
// skip meaningless resize signal
mFocusedSignal.Emit();
mIsFocus = true;
-
- DALI_LOG_RELEASE_INFO("EvasPlugin::OnEvasObjectFocusIn");
}
}
Clipboard::Get().HideClipboard();
mUnFocusedSignal.Emit();
-
- DALI_LOG_RELEASE_INFO("EvasPlugin::OnEvasObjectFocusOut");
}
}
Evas_Coord rel_x, rel_y;
Evas_Coord obj_x, obj_y, obj_w, obj_h;
- Evas_Object* eo = this->GetDaliAccessEvasObject();
+ Evas_Object* eo = this->GetAccessEvasObject();
if(eo)
{