#include <FWebCtrlAuthenticationChallenge.h>
#include <FSys_SystemResource.h>
#include <FUi_ResourceManager.h>
-//#include <FUiCtrl_PopupImpl.h>
#include "FWebCtrl_WebImpl.h"
#include "FWebCtrl_InputPickerPopup.h"
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);
GET_SHAPE_CONFIG(MESSAGEBOX::MIN_HEIGHT, orientation, __popupHeight);
GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_HEIGHT, orientation, __btnHeight);
+ __popupWidth -= 2*sideMargin;
+
std::unique_ptr<EditDate> pEditDate(new (std::nothrow) EditDate());
SysTryReturnResult(NID_WEB_CTRL, pEditDate.get(), E_OUT_OF_MEMORY, "Memory Allocation Failed.");
std::unique_ptr<CheckButton> 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);
__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);
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);