From f69dddae6f85dbd5b3e1ce9ebbe68f577b7b4461 Mon Sep 17 00:00:00 2001 From: BINDUCHAITANYA TUMMALA Date: Fri, 12 Apr 2013 16:15:08 +0530 Subject: [PATCH] Popup modifications fixing to portrait sizes Change-Id: I3bb48256759c1165fa3977a0358f9265c7a3bb02 Signed-off-by: BINDUCHAITANYA TUMMALA --- src/controls/FWebCtrl_InputPickerPopup.cpp | 5 +++-- src/controls/FWebCtrl_UserConfirmPopup.cpp | 2 +- src/controls/FWebCtrl_WebPopup.cpp | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controls/FWebCtrl_InputPickerPopup.cpp b/src/controls/FWebCtrl_InputPickerPopup.cpp index dd0d316..4877108 100755 --- a/src/controls/FWebCtrl_InputPickerPopup.cpp +++ b/src/controls/FWebCtrl_InputPickerPopup.cpp @@ -37,7 +37,6 @@ #include #include #include -//#include #include "FWebCtrl_WebImpl.h" #include "FWebCtrl_InputPickerPopup.h" @@ -97,7 +96,7 @@ _InputPickerPopup::Construct(const String& strDate, Ewk_Input_Type inputType) r = Parse(strDate, inputDateTime); } - _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); + _ControlOrientation orientation = _CONTROL_ORIENTATION_PORTRAIT; GET_SHAPE_CONFIG(EDITDATE::WIDTH, orientation, dateWidth); GET_SHAPE_CONFIG(EDITDATE::HEIGHT, orientation, dateHeight); @@ -106,6 +105,8 @@ _InputPickerPopup::Construct(const String& strDate, Ewk_Input_Type inputType) GET_SHAPE_CONFIG(MESSAGEBOX::MIN_HEIGHT, orientation, __popupHeight); GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_HEIGHT, orientation, __btnHeight); + __popupWidth -= 2*sideMargin; + std::unique_ptr pEditDate(new (std::nothrow) EditDate()); SysTryReturnResult(NID_WEB_CTRL, pEditDate.get(), E_OUT_OF_MEMORY, "Memory Allocation Failed."); diff --git a/src/controls/FWebCtrl_UserConfirmPopup.cpp b/src/controls/FWebCtrl_UserConfirmPopup.cpp index 1407af4..4b46e02 100755 --- a/src/controls/FWebCtrl_UserConfirmPopup.cpp +++ b/src/controls/FWebCtrl_UserConfirmPopup.cpp @@ -123,7 +123,7 @@ _UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo, std::unique_ptr pCheckButton (new (std::nothrow) CheckButton()); SysTryReturnResult(NID_WEB_CTRL, pCheckButton.get(), E_OUT_OF_MEMORY, "Memory Allocation failed."); - r = pCheckButton->Construct(Rectangle(0, 0, rect.width, rect.height), CHECK_BUTTON_STYLE_MARK, BACKGROUND_STYLE_DEFAULT, false, L"Remember Preference"); + r = pCheckButton->Construct(Rectangle(0, 0, rect.width, rect.height), CHECK_BUTTON_STYLE_MARK, BACKGROUND_STYLE_NONE, false, L"Remember Preference"); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); r = AddControl(*pCheckButton); diff --git a/src/controls/FWebCtrl_WebPopup.cpp b/src/controls/FWebCtrl_WebPopup.cpp index 099ac77..a661278 100644 --- a/src/controls/FWebCtrl_WebPopup.cpp +++ b/src/controls/FWebCtrl_WebPopup.cpp @@ -211,7 +211,7 @@ _WebPopup::GetPopupData(bool refresh) __pWebPopupData = std::unique_ptr<_WebPopupData> (new (std::nothrow) _WebPopupData()); SysTryReturn(NID_WEB_CTRL, __pWebPopupData.get(), null, E_OUT_OF_MEMORY, "[%s] Memory Allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY)); - _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); + _ControlOrientation orientation = _CONTROL_ORIENTATION_PORTRAIT; GET_SHAPE_CONFIG(MESSAGEBOX::DEFAULT_WIDTH, orientation, __pWebPopupData->popupDim.width); GET_SHAPE_CONFIG(MESSAGEBOX::MAX_HEIGHT, orientation, __pWebPopupData->popupDim.height); @@ -221,8 +221,7 @@ _WebPopup::GetPopupData(bool refresh) GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_SIDE_MARGIN_02, orientation, __pWebPopupData->spacePad); GET_SHAPE_CONFIG(LABEL::TEXT_FONT_SIZE, orientation, __pWebPopupData->labelFontSize); - GET_SHAPE_CONFIG(CHECKBUTTON::MARK_BITMAP_HEIGHT, orientation, __pWebPopupData->checkDim.height); - GET_SHAPE_CONFIG(CHECKBUTTON::MARK_BITMAP_WIDTH, orientation, __pWebPopupData->checkDim.width); + GET_DIMENSION_CONFIG(CHECKBUTTON::MIN_DIMENSION, orientation, __pWebPopupData->checkDim); GET_DIMENSION_CONFIG(EDIT::MIN_SIZE, orientation, __pWebPopupData->editDim); -- 2.7.4