Rollback code about quichpanel.

[platform/framework/native/uifw.git] / src / ui / FUi_Control.cpp

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
index 6f7e49f..f02801b 100644 (file)
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -53,7 +53,6 @@
 #include "FUiCtrl_Form.h"\r
 #include "FUiCtrl_Frame.h"\r
 #include "FUi_ContainerImpl.h"\r
-#include "FUiCtrl_Popup.h"\r
 \r
 using namespace std;\r
 using namespace Tizen::Base;\r
@@ -62,7 +61,6 @@ using namespace Tizen::Base::Runtime;
 using namespace Tizen::Graphics;\r
 using namespace Tizen::Ui;\r
 using namespace Tizen::Ui::Animations;\r
-using namespace Tizen::Ui::Controls;\r
 \r
 namespace {\r
 \r
@@ -3539,22 +3537,8 @@ _Control::GetAbsoluteBounds(void) const
        {\r
                Point winPoint = pWindow->GetPosition();\r
 \r
-               Rectangle popupRect(0, 0, 0, 0);\r
-               _Popup* pPopup = dynamic_cast<_Popup*>(pWindow);\r
-               if (pPopup)\r
-               {\r
-                       if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)\r
-                       {\r
-                               popupRect = _CoordinateSystemUtils::ConvertToInteger(pPopup->GetNativeBounds(true));\r
-                       }\r
-                       else\r
-                       {\r
-                               popupRect = _CoordinateSystemUtils::ConvertToInteger(pPopup->GetNativeBounds(false));\r
-                       }\r
-               }\r
-\r
-               accumPoint.x = accumPoint.x + winPoint.x + popupRect.x;\r
-               accumPoint.y = accumPoint.y + winPoint.y + popupRect.y;\r
+               accumPoint.x += winPoint.x;\r
+               accumPoint.y += winPoint.y;\r
        }\r
 \r
        absoluteBounds.x = accumPoint.x;\r
@@ -3596,22 +3580,8 @@ _Control::GetAbsoluteBoundsF(void) const
        {\r
                FloatPoint winPoint = pWindow->GetPositionF();\r
 \r
-               FloatRectangle popupRect(0.0f, 0.0f, 0.0f, 0.0f);\r
-               _Popup* pPopup = dynamic_cast<_Popup*>(pWindow);\r
-               if (pPopup)\r
-               {\r
-                       if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)\r
-                       {\r
-                               popupRect = pPopup->GetNativeBounds(true);\r
-                       }\r
-                       else\r
-                       {\r
-                               popupRect = pPopup->GetNativeBounds(false);\r
-                       }\r
-               }\r
-\r
-               accumPoint.x = accumPoint.x + winPoint.x + popupRect.x;\r
-               accumPoint.y = accumPoint.y + winPoint.y + popupRect.y;\r
+               accumPoint.x += winPoint.x;\r
+               accumPoint.y += winPoint.y;\r
        }\r
 \r
        absoluteBounds.x = accumPoint.x;\r