From 471c8efa294f024775012f9730a91451437c43b4 Mon Sep 17 00:00:00 2001 From: Keuckdo Bang Date: Wed, 20 Mar 2013 16:04:00 +0900 Subject: [PATCH] Rollback code for releasing RC12. Change-Id: Ib4e78f82ea8da20b6ac2060a2350959c848442a5 --- src/ui/controls/FUiCtrl_Form.cpp | 73 ---------------------------------------- src/ui/inc/FUiCtrl_Form.h | 2 -- 2 files changed, 75 deletions(-) diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp index c787553..ac9d0e6 100644 --- a/src/ui/controls/FUiCtrl_Form.cpp +++ b/src/ui/controls/FUiCtrl_Form.cpp @@ -2687,78 +2687,5 @@ _Form::GetFocusList(void) const return __pFocusControlList.get(); } -void -_Form::UpdateClientBounds(const FloatDimension& size) -{ - FloatRectangle clientBounds(0.0f, 0.0f, size.width, size.height); - - if (__deflated) - { - clientBounds.height -= __deflatedHeight; - } - - FloatRectangle indicatorBounds = GetIndicatorBoundsF(); - - _Control* pParent = GetParent(); - _Frame* pFrame = dynamic_cast<_Frame*>(pParent); - if (pFrame) - { - FrameShowMode mode = pFrame->GetShowMode(); - if (mode == FRAME_SHOW_MODE_FULL_SCREEN) - { - if (FORM_STYLE_INDICATOR & __formStyle) - { - if (IsIndicatorVisible() && !IsIndicatorTranslucent()) - { - clientBounds.y += indicatorBounds.height; - clientBounds.height -= indicatorBounds.height; - } - } - } - } - else - { - if (FORM_STYLE_INDICATOR & __formStyle) - { - if (IsIndicatorVisible() && !IsIndicatorTranslucent()) - { - clientBounds.y += indicatorBounds.height; - clientBounds.height -= indicatorBounds.height; - } - } - } - - if (__pHeader) - { - if (__pHeader->GetVisibleState() && !IsHeaderTranslucent()) - { - clientBounds.y += GetToolbarHeightF(true); - clientBounds.height -= GetToolbarHeightF(true); - } - } - - if (__pTab) - { - if (__pTab->GetVisibleState()) //&& !IsHeaderTranslucent()) - { - clientBounds.y += GetTabHeightF(); - clientBounds.height -= GetTabHeightF(); - } - } - - if (__pFooter) - { - if (FORM_STYLE_FOOTER & __formStyle || FORM_STYLE_SOFTKEY_0 & __formStyle || FORM_STYLE_SOFTKEY_1 & __formStyle - || FORM_STYLE_OPTIONKEY & __formStyle) - { - if (__pFooter->GetVisibleState() && !IsFooterTranslucent()) - { - clientBounds.height -= GetToolbarHeightF(false); - } - } - } - - SetClientBounds(clientBounds); -} }}} // Tizen::Ui::Controls diff --git a/src/ui/inc/FUiCtrl_Form.h b/src/ui/inc/FUiCtrl_Form.h index 2395d65..a8efdb4 100644 --- a/src/ui/inc/FUiCtrl_Form.h +++ b/src/ui/inc/FUiCtrl_Form.h @@ -193,8 +193,6 @@ public: result SetNotificationTrayOpenEnabled(bool enable); bool IsNotificationTrayOpenEnabled(void) const; - void UpdateClientBounds(const Tizen::Graphics::FloatDimension& size); - //callback virtual void OnDraw(void); virtual void OnActionPerformed(const Tizen::Ui::_Control& source, int actionId); -- 2.7.4