Revert "Change new coordinate system"

This reverts commit af3b8e3115091c79f3474fa2a36fedd6e13cfbd0

diff --git a/src/ui/FUi_UiBuilder.cpp b/src/ui/FUi_UiBuilder.cpp
index 9fa6cdc..b97047b 100644 (file)
--- a/src/ui/FUi_UiBuilder.cpp
+++ b/src/ui/FUi_UiBuilder.cpp
@@ -414,19 +414,19 @@ _UiBuilder::GetUiBuilderRotateState() const
 }
 
 result
-_UiBuilder::SetFormXmlResolution(int formXmlResoluton)
+_UiBuilder::SetFormXmlResolution(_LogicalResolution formXmlResoluton)
 {
        result r = E_SUCCESS;
 
        if (__pTransform == null)
        {
-               if (formXmlResoluton == 720 && __logicalResolution == 480)
+               if (formXmlResoluton == RESOLUTION_LOGICAL_720 && __logicalResolution == 480)
                {
                        __pTransform = _CoordinateSystem::GetTransformerN(RESOLUTION_LOGICAL_720, RESOLUTION_LOGICAL_480);
                                SysTryReturn(NID_UI, __pTransform != null, null, GetLastResult(),
                                                        "Failed to get Transformer");
                }
-               if (formXmlResoluton == 480 && __logicalResolution == 720)
+               if (formXmlResoluton == RESOLUTION_LOGICAL_480 && __logicalResolution == 720)
                {
                        __pTransform = _CoordinateSystem::GetTransformerN(RESOLUTION_LOGICAL_480, RESOLUTION_LOGICAL_720);
                        SysTryReturn(NID_UI, __pTransform != null, GetLastResult(), GetLastResult(),

diff --git a/src/ui/FUi_UiBuilderXmlHandler.cpp b/src/ui/FUi_UiBuilderXmlHandler.cpp
index a195576..fc0a856 100644 (file)
--- a/src/ui/FUi_UiBuilderXmlHandler.cpp
+++ b/src/ui/FUi_UiBuilderXmlHandler.cpp
@@ -93,15 +93,15 @@ ParseCharactersSaxFunc(void*ctx, const xmlChar*ch, int len)
 {
        if (XMLHandler->__formXmlResolutionExists == true)
        {
-               int formXmlResolution = 0;
+               Tizen::Graphics::_LogicalResolution formXmlResolution;
                if (xmlStrncmp( ch, (xmlChar*)"720", len) == 0)
                {
-                       formXmlResolution = 720;
+                       formXmlResolution = Tizen::Graphics::RESOLUTION_LOGICAL_720;
                        XMLHandler->__errorResult = XMLHandler->__pGenerator->SetFormXmlResolution(formXmlResolution);
                }
                else
                {
-                       formXmlResolution = 480;
+                       formXmlResolution = Tizen::Graphics::RESOLUTION_LOGICAL_480;
                        XMLHandler->__errorResult = XMLHandler->__pGenerator->SetFormXmlResolution(formXmlResolution);
                }
                XMLHandler->__formXmlResolutionExists = false;

diff --git a/src/ui/inc/FUi_UiBuilder.h b/src/ui/inc/FUi_UiBuilder.h
index 795a5f6..4a65dcf 100644 (file)
--- a/src/ui/inc/FUi_UiBuilder.h
+++ b/src/ui/inc/FUi_UiBuilder.h
@@ -64,7 +64,7 @@ public:
        _UiBuilderScreenRotate GetUiBuilderRotateState(void) const;
        _UiBuilderControl* GetControl(int index) const;
        _UiBuilderControl* GetControl(const Tizen::Base::String& id) const;
-       result SetFormXmlResolution(int formXmlResoluton);
+       result SetFormXmlResolution(Tizen::Graphics::_LogicalResolution formXmlResoluton);
        Tizen::Graphics::_ICoordinateSystemTransformer* GetTransformer(void) const;
 private:
        _UiBuilder(const _UiBuilder& rhs);