Tizen 2.2.1

diff --git a/src/graphics/text/FGrp_TextTextLine.cpp b/src/graphics/text/FGrp_TextTextLine.cpp
index b82aa3e..d83dfc7 100644 (file)
--- a/src/graphics/text/FGrp_TextTextLine.cpp
+++ b/src/graphics/text/FGrp_TextTextLine.cpp
@@ -578,7 +578,7 @@ TextLine::GetTextExtentF(int textIndexFromLineOffset, int textLength) const
 
                if (isRtl[0] && isRtl[1]) // R + R
                {
-                       if (isNeutral[0] && isNeutral[1] && (!TextUtility::IsRTLCharacter(text[0]) && !TextUtility::IsRTLCharacter(text[1])))
+                       if (isNeutral[0] && isNeutral[1])
                        {
                                extent.x = prevRight;
                        }

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index d83b84d..b9f6d9c 100644 (file)
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -1889,7 +1889,7 @@ public:
 
                bool isFiltered = false;
 
-               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != _KEY_INVALID)
+               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != KEY_INVALID)
                {
                        _ControlImpl* pControlImpl = static_cast<_ControlImpl*>(source.GetUserData());
                        SysTryReturn(NID_UI, pControlImpl, false, E_OBJ_NOT_FOUND, "[E_OBJ_NOT_FOUND] pControlImpl == null.");
@@ -1926,7 +1926,7 @@ public:
 
                bool isFiltered = false;
 
-               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != _KEY_INVALID)
+               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != KEY_INVALID)
                {
                        _ControlImpl* pControlImpl = static_cast<_ControlImpl*>(source.GetUserData());
                        if (pControlImpl == null)
@@ -2000,7 +2000,7 @@ public:
 
                bool isFiltered = false;
 
-               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != _KEY_INVALID)
+               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != KEY_INVALID)
                {
                        _ControlImpl* pControlImpl = static_cast<_ControlImpl*>(source.GetUserData());
                        if (pControlImpl == null)
@@ -2066,7 +2066,7 @@ public:
        {
                bool isFiltered = false;
 
-               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != _KEY_INVALID)
+               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != KEY_INVALID)
                {
                        _ControlImpl* pControlImpl = static_cast<_ControlImpl*>(source.GetUserData());
                        if (pControlImpl == null)
@@ -2113,7 +2113,7 @@ public:
        {
                bool isFiltered = false;
 
-               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != _KEY_INVALID)
+               if (__impl.__pPublicPropagatedKeyEventListener != null && keyInfo.GetKeyCode() != KEY_INVALID)
                {
                        _ControlImpl* pControlImpl = static_cast<_ControlImpl*>(source.GetUserData());
                        if (pControlImpl == null)

diff --git a/src/ui/FUi_FocusManagerImpl.cpp b/src/ui/FUi_FocusManagerImpl.cpp
index 9007360..2cda225 100644 (file)
--- a/src/ui/FUi_FocusManagerImpl.cpp
+++ b/src/ui/FUi_FocusManagerImpl.cpp
@@ -444,10 +444,10 @@ _FocusManagerImpl::StartFocusTraversal(_Control* pControl, FocusDirection focusD
 bool
 _FocusManagerImpl::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 {
-       //Ecore_X_Window rootWindow = ecore_x_window_root_first_get();
-       //Ecore_X_Atom keyboardExist = ecore_x_atom_get("X External Keyboard Exist");
+       Ecore_X_Window rootWindow = ecore_x_window_root_first_get();
+       Ecore_X_Atom keyboardExist = ecore_x_atom_get("X External Keyboard Exist");
        unsigned int keyboardNumber = 0;
-       //int ret = ecore_x_window_prop_card32_get(rootWindow, keyboardExist, &keyboardNumber, 1);
+       int ret = ecore_x_window_prop_card32_get(rootWindow, keyboardExist, &keyboardNumber, 1);
        if (keyboardNumber == 0)
        {
                return false;

diff --git a/src/ui/FUi_TouchTapGestureDetector.cpp b/src/ui/FUi_TouchTapGestureDetector.cpp
index 4edfbef..3f1a6b7 100644 (file)
--- a/src/ui/FUi_TouchTapGestureDetector.cpp
+++ b/src/ui/FUi_TouchTapGestureDetector.cpp
@@ -65,9 +65,9 @@ _TouchTapGestureDetector::_TouchTapGestureDetector(void)
        , __touchCount(DEFAULT_TOUCH_COUNT)
        , __maxPointId(DEFAULT_TOUCH_COUNT-1)
        , __pGestureTimerManager(null)
-       , __deleteTimer(true)
-       , __touchCanceled(false)
        , __pTapInfoList(null)
+       , __touchCanceled(false)
+       , __deleteTimer(true)
 {
        result r = GetLastResult();
        SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));

diff --git a/src/ui/animations/FUiAnim_ControlVisualElement.h b/src/ui/animations/FUiAnim_ControlVisualElement.h
index dd08345..758d8cb 100644 (file)
--- a/src/ui/animations/FUiAnim_ControlVisualElement.h
+++ b/src/ui/animations/FUiAnim_ControlVisualElement.h
@@ -34,6 +34,14 @@ namespace Tizen { namespace Ui { namespace Animations
 class _ControlVisualElement
        : public _VisualElement
 {
+#if 0
+       DECLARE_CLASS_BEGIN(_ControlVisualElement, _VisualElementImpl);
+       DECLARE_PROPERTY(VePropBounds, _PropGetControlBounds, _PropSetControlBounds);
+       DECLARE_PROPERTY(VePropImplicitAnimationEnabled, _PropGetControlImplicitAnimationEnabled, _PropSetControlImplicitAnimationEnabled);
+       DECLARE_PROPERTY(VePropPropertyPropagationEnabled, _PropGetControlPropertyPropagationEnabled, _PropSetControlPropertyPropagationEnabled);
+       DECLARE_CLASS_END();
+#endif
+
 public:
        /**
         * This is the default constructor for this class.

diff --git a/src/ui/animations/FUiAnim_EflLayer.cpp b/src/ui/animations/FUiAnim_EflLayer.cpp
index c85af49..1dbe25e 100644 (file)
--- a/src/ui/animations/FUiAnim_EflLayer.cpp
+++ b/src/ui/animations/FUiAnim_EflLayer.cpp
@@ -786,7 +786,7 @@ _EflLayer::Flush(void)
                {
                        if (_isMapped && _isConfigured)
                        {
-                               //PRINT("[%#x | %#x] ecore_evas_manual_render -- mapped \n", (unsigned int)this ,ecore_evas_window_get(_pEcoreEvas));
+                               //PRINT("[%#x | %#x] ecore_evas_manual_render -- mapped (child:%d)\n", (unsigned int)this ,ecore_evas_window_get(_pEcoreEvas), __GetChildrenCount(_pRootVisualElement));
                                __needPreRender = false;
                                ecore_evas_manual_render(_pEcoreEvas);
                                __needPreRender = true;
@@ -798,7 +798,7 @@ _EflLayer::Flush(void)
                        {
                                if(_isShow && _needForceManualRender)
                                {
-                                       PRINT("[%#x | %#x] ecore_evas_manual_render -- _needForceManualRender \n", (unsigned int)this , ecore_evas_window_get(_pEcoreEvas));
+                                       PRINT("[%#x | %#x] ecore_evas_manual_render -- _needForceManualRender (child:%d)\n", (unsigned int)this , ecore_evas_window_get(_pEcoreEvas), __GetChildrenCount(_pRootVisualElement));
                                        __needPreRender = false;
                                        ecore_evas_manual_render(_pEcoreEvas);
                                        __needPreRender = true;
@@ -809,12 +809,12 @@ _EflLayer::Flush(void)
                                        return;
                                }
 
-                               PRINT("[%#x | %#x] ecore_evas_manual_render -- unmapped(map:%d configure:%d) - not called\n", (unsigned int)this , ecore_evas_window_get(_pEcoreEvas), _isMapped, _isConfigured);
+                               PRINT("[%#x | %#x] ecore_evas_manual_render -- unmapped(map:%d configure:%d) - not called(child:%d)\n", (unsigned int)this , ecore_evas_window_get(_pEcoreEvas), _isMapped, _isConfigured, __GetChildrenCount(_pRootVisualElement));
                        }
                }
                else // not window type
                {
-                       PRINT("[%#x | %#x] ecore_evas_manual_render -- unknown type\n", (unsigned int)this , ecore_evas_window_get(_pEcoreEvas));
+                       PRINT("[%#x | %#x] ecore_evas_manual_render -- unknown type(child:%d)\n", (unsigned int)this , ecore_evas_window_get(_pEcoreEvas), __GetChildrenCount(_pRootVisualElement));
                        __needPreRender = false;
                        ecore_evas_manual_render(_pEcoreEvas);
                        __needPreRender = true;

diff --git a/src/ui/animations/FUiAnim_EflNode.cpp b/src/ui/animations/FUiAnim_EflNode.cpp
index 37bd806..e882e6b 100644 (file)
--- a/src/ui/animations/FUiAnim_EflNode.cpp
+++ b/src/ui/animations/FUiAnim_EflNode.cpp
@@ -850,10 +850,6 @@ _EflNode::Reconfigure(VisualElementSurface* pSurface, _VisualElementImpl& elemen
                // create new surface
                if (unlikely(createNewObject))
                {
-                       __renderOperation = element.__renderOperation;
-                       evas_object_render_op_set(pImageObjectNew, GetRenderOperation(__renderOperation));
-
-
                        unique_ptr<VisualElementSurface> pNewSharedSurface(new (std::nothrow) VisualElementSurface(*pSurface));
                        SysTryReturnResult(NID_UI_ANIM, pNewSharedSurface, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
@@ -970,9 +966,6 @@ _EflNode::Reconfigure(VisualElementSurface* pSurface, _VisualElementImpl& elemen
                        __pRectangleObject = evas_object_rectangle_add(__pEvas);
                        if (likely(__pRectangleObject))
                        {
-                               __renderOperation = element.__renderOperation;
-                               evas_object_render_op_set(__pRectangleObject, GetRenderOperation(__renderOperation));
-
                                //evas_object_pass_events_set(__pRectangleObject, EINA_TRUE);
                                evas_object_smart_member_add(__pRectangleObject, __pSmartObject);
                                evas_object_lower(__pRectangleObject);

diff --git a/src/ui/controls/FUiCtrl_DateTimePicker.cpp b/src/ui/controls/FUiCtrl_DateTimePicker.cpp
index 97a7788..2631674 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimePicker.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimePicker.cpp
@@ -185,9 +185,6 @@ _DateTimePicker::CreateFooter(void)
        GET_SHAPE_CONFIG(DATETIMEPICKER::FOOTER_HEIGHT, orientation, bounds.height);
        GET_SHAPE_CONFIG(DATETIMEPICKER::INPUTPAD_HEIGHT, orientation, bounds.y);
 
-       bounds.y = CoordinateSystem::AlignToDevice(FloatPoint(0.0f, bounds.y)).y;
-       bounds.height = CoordinateSystem::AlignToDevice(FloatDimension(0.0f, bounds.height)).height;
-
        bounds.x = 0.0f;
        bounds.y = GetBoundsF().height - bounds.y - bounds.height;
        bounds.width = GetBoundsF().width;

diff --git a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
index 50a2fe7..f577e16 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
@@ -581,8 +581,6 @@ _DateTimePresenter::OnChangeLayout(_ControlOrientation orientation)
 
        GET_SHAPE_CONFIG(DATETIMEPICKER::INPUTPAD_HEIGHT, orientation, inputPadBounds.height);
 
-       inputPadBounds.height = CoordinateSystem::AlignToDevice(FloatDimension(pickerBounds.width, inputPadBounds.height)).height;
-
        inputPadBounds.width = pickerBounds.width;
        inputPadBounds.y = pickerBounds.height - inputPadBounds.height;
 

diff --git a/src/ui/controls/FUiCtrl_Indicator.cpp b/src/ui/controls/FUiCtrl_Indicator.cpp
index efcf022..a2d5e09 100644 (file)
--- a/src/ui/controls/FUiCtrl_Indicator.cpp
+++ b/src/ui/controls/FUiCtrl_Indicator.cpp
@@ -932,7 +932,7 @@ _Indicator::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
                return false;
        }
 
-       unsigned long pointId = touchinfo.GetPointId();
+       int pointId = touchinfo.GetPointId();
        _TouchManager* pTouchManager = _TouchManager::GetInstance();
 
        FloatPoint touchPosition = source.ConvertToScreenPosition(touchinfo.GetCurrentPosition());

diff --git a/src/ui/inc/FUiCtrl_Indicator.h b/src/ui/inc/FUiCtrl_Indicator.h
index 9d90567..120d71a 100644 (file)
--- a/src/ui/inc/FUiCtrl_Indicator.h
+++ b/src/ui/inc/FUiCtrl_Indicator.h
@@ -119,7 +119,7 @@ private:
                Tizen::Graphics::FloatPoint __startTouchPoint;
                bool __animating;
                bool __touchPressed;
-               unsigned long __pointId;
+               int __pointId;
                int __quickpanelOpened;
 
                Ecore_Event_Handler* __pClientMessageReceived;