, __screenBottomMargin(0.0f)
, __screenLeftMargin(0.0f)
, __screenRightMargin(0.0f)
- , __arrowMargin(0.0f)
+ , __arrowTopMargin(0.0f)
+ , __arrowBottomMargin(0.0f)
+ , __arrowRightMargin(0.0f)
+ , __arrowLeftMargin(0.0f)
, __arrowWidth(0.0f)
, __arrowHeight(0.0f)
, __itemWidth(0.0f)
GET_SHAPE_CONFIG(CONTEXTMENU::SCREEN_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __screenBottomMargin);
GET_SHAPE_CONFIG(CONTEXTMENU::SCREEN_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __screenLeftMargin);
GET_SHAPE_CONFIG(CONTEXTMENU::SCREEN_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __screenRightMargin);
- GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowTopMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowBottomMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowLeftMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowRightMargin);
GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __arrowWidth);
GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __arrowHeight);
GET_SHAPE_CONFIG(CONTEXTMENU::GRID_ICON_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemBitmapWidth);
float screenBottomMargin = __screenBottomMargin;
float screenLeftMargin = __screenLeftMargin;
float screenRightMargin = __screenRightMargin;
- float arrowMargin = __arrowMargin;
FloatPoint anchorPosition = __pContextMenu->GetAnchorPosition();
windowRect.height = bodyRect.height + arrowRect.height;
bodyRect.x = 0.0f;
- bodyRect.y = arrowMargin;
+ bodyRect.y = __arrowTopMargin;
// Set arrow position
arrowRect.x = anchorPosition.x - (arrowRect.width / 2.0f) - windowRect.x;
windowRect.height = bodyRect.height + arrowRect.height;
bodyRect.x = 0.0f;
- bodyRect.y = arrowRect.height - arrowMargin;
+ bodyRect.y = arrowRect.height - __arrowBottomMargin;
// Set arrow position
arrowRect.x = anchorPosition.x - (arrowRect.width / 2.0f) - windowRect.x;
windowRect.width = bodyRect.width + arrowRect.width;
windowRect.height = bodyRect.height;
- bodyRect.x = arrowMargin;
+ bodyRect.x = __arrowRightMargin;
bodyRect.y = 0.0f;
// Set arrow position
windowRect.width = bodyRect.width + arrowRect.width;
windowRect.height = bodyRect.height;
- bodyRect.x = arrowRect.width - arrowMargin;
+ bodyRect.x = arrowRect.width - __arrowLeftMargin;
bodyRect.y = 0.0f;
// Set arrow position
, __screenBottomMargin(0.0f)
, __screenLeftMargin(0.0f)
, __screenRightMargin(0.0f)
- , __arrowMargin(0.0f)
+ , __arrowTopMargin(0.0f)
+ , __arrowBottomMargin(0.0f)
+ , __arrowRightMargin(0.0f)
+ , __arrowLeftMargin(0.0f)
, __arrowWidth(0.0f)
, __arrowHeight(0.0f)
, __itemWidth(0.0f)
GET_SHAPE_CONFIG(CONTEXTMENU::SCREEN_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __screenBottomMargin);
GET_SHAPE_CONFIG(CONTEXTMENU::SCREEN_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __screenLeftMargin);
GET_SHAPE_CONFIG(CONTEXTMENU::SCREEN_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __screenRightMargin);
- GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowTopMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowBottomMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowLeftMargin);
+ GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowRightMargin);
GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __arrowWidth);
GET_SHAPE_CONFIG(CONTEXTMENU::ANCHOR_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __arrowHeight);
GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ICON_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemBitmapWidth);
float screenBottomMargin = __screenBottomMargin;
float screenLeftMargin = __screenLeftMargin;
float screenRightMargin = __screenRightMargin;
- float arrowMargin = __arrowMargin;
FloatPoint anchorPosition = __pContextMenu->GetAnchorPosition();
FloatDimension screen = _ControlManager::GetInstance()->GetScreenSizeF();
windowRect.height = bodyRect.height + arrowRect.height;
bodyRect.x = 0.0f;
- bodyRect.y = arrowMargin;
+ bodyRect.y = __arrowTopMargin;
// Set arrow position
arrowRect.x = anchorPosition.x - (arrowRect.width / 2.0f) - windowRect.x;
windowRect.height = bodyRect.height + arrowRect.height;
bodyRect.x = 0.0f;
- bodyRect.y = arrowRect.height - arrowMargin;
+ bodyRect.y = arrowRect.height - __arrowBottomMargin;
// Set arrow position
arrowRect.x = anchorPosition.x - (arrowRect.width / 2.0f) - windowRect.x;
windowRect.width = bodyRect.width + arrowRect.width;
windowRect.height = bodyRect.height;
- bodyRect.x = arrowMargin;
+ bodyRect.x = __arrowRightMargin;
bodyRect.y = 0.0f;
// Set arrow position
windowRect.width = bodyRect.width + arrowRect.width;
windowRect.height = bodyRect.height;
- bodyRect.x = arrowRect.width - arrowMargin;
+ bodyRect.x = arrowRect.width - __arrowLeftMargin;
bodyRect.y = 0.0f;
// Set arrow position
float __screenBottomMargin;
float __screenLeftMargin;
float __screenRightMargin;
- float __arrowMargin;
+ float __arrowTopMargin;
+ float __arrowBottomMargin;
+ float __arrowRightMargin;
+ float __arrowLeftMargin;
float __arrowWidth;
float __arrowHeight;
float __itemWidth;
float __screenBottomMargin;
float __screenLeftMargin;
float __screenRightMargin;
- float __arrowMargin;
+ float __arrowTopMargin;
+ float __arrowBottomMargin;
+ float __arrowRightMargin;
+ float __arrowLeftMargin;
float __arrowWidth;
float __arrowHeight;
float __itemWidth;
DECLARE_SHAPE_CONFIG(SCREEN_BOTTOM_MARGIN, 36);
DECLARE_SHAPE_CONFIG(SCREEN_LEFT_MARGIN, 37);
DECLARE_SHAPE_CONFIG(SCREEN_RIGHT_MARGIN, 38);
+ DECLARE_SHAPE_CONFIG(ANCHOR_TOP_MARGIN, 39);
+ DECLARE_SHAPE_CONFIG(ANCHOR_BOTTOM_MARGIN, 40);
+ DECLARE_SHAPE_CONFIG(ANCHOR_LEFT_MARGIN, 41);
+ DECLARE_SHAPE_CONFIG(ANCHOR_RIGHT_MARGIN, 42);
DECLARE_FIXED_VALUE_CONFIG(GRID_ITEM_GAP, 1);
DECLARE_END_UI_CONFIG(CONTEXTMENU);
-#endif //_FUI_RESOURCE_CONTEXTMENU_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_CONTEXTMENU_CONFIG_H_
ADD_SHAPE_CONFIG(GRID_ITEM_FONT_SIZE, 32);
ADD_SHAPE_CONFIG(LIST_ITEM_HEIGHT, 112);
- ADD_SHAPE_CONFIG(LIST_MIN_WIDTH, 368);
+ ADD_SHAPE_CONFIG(LIST_MIN_WIDTH, 386);
ADD_SHAPE_CONFIG(LIST_MAX_WIDTH, 620);
- ADD_SHAPE_CONFIG(LIST_TOP_MARGIN, 12);
- ADD_SHAPE_CONFIG(LIST_BOTTOM_MARGIN, 12);
- ADD_SHAPE_CONFIG(LIST_LEFT_MARGIN, 12);
- ADD_SHAPE_CONFIG(LIST_RIGHT_MARGIN, 12);
+ ADD_SHAPE_CONFIG(LIST_TOP_MARGIN, 8);
+ ADD_SHAPE_CONFIG(LIST_BOTTOM_MARGIN, 16);
+ ADD_SHAPE_CONFIG(LIST_LEFT_MARGIN, 10);
+ ADD_SHAPE_CONFIG(LIST_RIGHT_MARGIN, 10);
ADD_SHAPE_CONFIG(LIST_ICON_WIDTH, 45);
ADD_SHAPE_CONFIG(LIST_ICON_HEIGHT, 45);
ADD_SHAPE_CONFIG(GRID_ITEM_MAX_WIDTH, 324);
ADD_SHAPE_CONFIG(GRID_TEXT_MARGIN, 16);
ADD_SHAPE_CONFIG(GRID_DIVIDER_HEIGHT, 74);
- ADD_SHAPE_CONFIG(GRID_TOP_MARGIN, 12);
- ADD_SHAPE_CONFIG(GRID_BOTTOM_MARGIN, 12);
- ADD_SHAPE_CONFIG(GRID_LEFT_MARGIN, 12);
- ADD_SHAPE_CONFIG(GRID_RIGHT_MARGIN, 12);
+ ADD_SHAPE_CONFIG(GRID_TOP_MARGIN, 8);
+ ADD_SHAPE_CONFIG(GRID_BOTTOM_MARGIN, 16);
+ ADD_SHAPE_CONFIG(GRID_LEFT_MARGIN, 10);
+ ADD_SHAPE_CONFIG(GRID_RIGHT_MARGIN, 10);
ADD_SHAPE_CONFIG(GRID_ICON_WIDTH, 45);
ADD_SHAPE_CONFIG(GRID_ICON_HEIGHT, 45);
ADD_SHAPE_CONFIG(ANCHOR_WIDTH, 36);
ADD_SHAPE_CONFIG(ANCHOR_HEIGHT, 36);
ADD_SHAPE_CONFIG(ANCHOR_MARGIN, 14);
+ ADD_SHAPE_CONFIG(ANCHOR_TOP_MARGIN, 18);
+ ADD_SHAPE_CONFIG(ANCHOR_LEFT_MARGIN, 12);
+ ADD_SHAPE_CONFIG(ANCHOR_RIGHT_MARGIN, 12);
+ ADD_SHAPE_CONFIG(ANCHOR_BOTTOM_MARGIN, 10);
ADD_SHAPE_CONFIG(APPEARING_ANIMATION_DISTANCE_X, 40);
ADD_SHAPE_CONFIG(APPEARING_ANIMATION_DISTANCE_Y, 40);