appling ContextMenu GUI guide

Change-Id: Ib881b33fc218733b0110bf357ca77c2945277a5f
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg.#.png
new file mode 100755 (executable)
index 0000000..3625e91
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg_ef.#.png
index b1e219d..b7426fa 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom.png
new file mode 100755 (executable)
index 0000000..aae4fdb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom_ef.png
index 3f5688b..12c65f8 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_bottom_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left.png
new file mode 100755 (executable)
index 0000000..a7be7bd
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left_ef.png
index f9ce89a..253fe7f 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right.png
new file mode 100755 (executable)
index 0000000..b65b16e
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right_ef.png
index 68f1437..e50dad1 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top.png
new file mode 100755 (executable)
index 0000000..c8d6c07
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top_ef.png
index 5b2d7b8..fd4d190 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_tail_top_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg.#.png
new file mode 100755 (executable)
index 0000000..3625e91
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg_ef.#.png
index 726ba72..b7426fa 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom.png
new file mode 100755 (executable)
index 0000000..aae4fdb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom_ef.png
index c75ab53..12c65f8 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_bottom_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left.png
new file mode 100755 (executable)
index 0000000..a7be7bd
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left_ef.png
index 7699e81..253fe7f 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right.png
new file mode 100755 (executable)
index 0000000..b65b16e
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right_ef.png
index 072a66d..e50dad1 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top.png
new file mode 100755 (executable)
index 0000000..c8d6c07
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top_ef.png
index 7396d5d..fd4d190 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_tail_top_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg.#.png
new file mode 100755 (executable)
index 0000000..af20fbd
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg_ef.#.png
index 9b6ee97..60e7825 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom.png
new file mode 100755 (executable)
index 0000000..c642ef4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom_ef.png
index 39f8f8f..48229e2 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_bottom_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left.png
new file mode 100755 (executable)
index 0000000..ae58d1c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left_ef.png
index e74d333..ddba5b0 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right.png
new file mode 100755 (executable)
index 0000000..50b5e0b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right_ef.png
index 9fd5a4c..dbe997e 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top.png
new file mode 100755 (executable)
index 0000000..b760c0a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top_ef.png
index 6c0eb22..a96f1bf 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_tail_top_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg.#.png
new file mode 100755 (executable)
index 0000000..af20fbd
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg_ef.#.png
index d204e6a..60e7825 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom.png
new file mode 100755 (executable)
index 0000000..c642ef4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom_ef.png
index ca16397..48229e2 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_bottom_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left.png
new file mode 100755 (executable)
index 0000000..ae58d1c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left_ef.png
index 481a785..ddba5b0 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right.png
new file mode 100755 (executable)
index 0000000..50b5e0b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right_ef.png
index 066492d..dbe997e 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top.png
new file mode 100755 (executable)
index 0000000..b760c0a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top_ef.png
index d63a128..a96f1bf 100755 (executable)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_tail_top_ef.png differ

diff --git a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
index 4fd03b9..1f396ac 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
@@ -66,7 +66,10 @@ _ContextMenuGridPresenter::_ContextMenuGridPresenter(_ContextMenu* pContextMenu)
        , __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)
@@ -160,7 +163,10 @@ _ContextMenuGridPresenter::LoadShape(void)
        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);
@@ -420,7 +426,6 @@ _ContextMenuGridPresenter::CalculateRect(void)
        float screenBottomMargin = __screenBottomMargin;
        float screenLeftMargin = __screenLeftMargin;
        float screenRightMargin = __screenRightMargin;
-       float arrowMargin = __arrowMargin;
 
        FloatPoint anchorPosition = __pContextMenu->GetAnchorPosition();
 
@@ -510,7 +515,7 @@ _ContextMenuGridPresenter::CalculateRect(void)
                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;
@@ -566,7 +571,7 @@ _ContextMenuGridPresenter::CalculateRect(void)
                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;
@@ -627,7 +632,7 @@ _ContextMenuGridPresenter::CalculateRect(void)
                windowRect.width = bodyRect.width + arrowRect.width;
                windowRect.height = bodyRect.height;
 
-               bodyRect.x = arrowMargin;
+               bodyRect.x = __arrowRightMargin;
                bodyRect.y = 0.0f;
 
                // Set arrow position
@@ -688,7 +693,7 @@ _ContextMenuGridPresenter::CalculateRect(void)
                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

diff --git a/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
index 52fe4fd..6a57575 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
@@ -64,7 +64,10 @@ _ContextMenuListPresenter::_ContextMenuListPresenter(_ContextMenu* pContextMenu)
        , __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)
@@ -137,7 +140,10 @@ _ContextMenuListPresenter::LoadShape(void)
        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);
@@ -411,7 +417,6 @@ _ContextMenuListPresenter::CalculateRect(void)
        float screenBottomMargin = __screenBottomMargin;
        float screenLeftMargin = __screenLeftMargin;
        float screenRightMargin = __screenRightMargin;
-       float arrowMargin = __arrowMargin;
 
        FloatPoint anchorPosition = __pContextMenu->GetAnchorPosition();
        FloatDimension screen = _ControlManager::GetInstance()->GetScreenSizeF();
@@ -498,7 +503,7 @@ _ContextMenuListPresenter::CalculateRect(void)
                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;
@@ -554,7 +559,7 @@ _ContextMenuListPresenter::CalculateRect(void)
                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;
@@ -615,7 +620,7 @@ _ContextMenuListPresenter::CalculateRect(void)
                windowRect.width = bodyRect.width + arrowRect.width;
                windowRect.height = bodyRect.height;
 
-               bodyRect.x = arrowMargin;
+               bodyRect.x = __arrowRightMargin;
                bodyRect.y = 0.0f;
 
                // Set arrow position
@@ -676,7 +681,7 @@ _ContextMenuListPresenter::CalculateRect(void)
                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

diff --git a/src/ui/inc/FUiCtrl_ContextMenuGridPresenter.h b/src/ui/inc/FUiCtrl_ContextMenuGridPresenter.h
index fc7b653..565310d 100644 (file)
--- a/src/ui/inc/FUiCtrl_ContextMenuGridPresenter.h
+++ b/src/ui/inc/FUiCtrl_ContextMenuGridPresenter.h
@@ -128,7 +128,10 @@ private:
        float __screenBottomMargin;
        float __screenLeftMargin;
        float __screenRightMargin;
-       float __arrowMargin;
+       float __arrowTopMargin;
+       float __arrowBottomMargin;
+       float __arrowRightMargin;
+       float __arrowLeftMargin;
        float __arrowWidth;
        float __arrowHeight;
        float __itemWidth;

diff --git a/src/ui/inc/FUiCtrl_ContextMenuListPresenter.h b/src/ui/inc/FUiCtrl_ContextMenuListPresenter.h
index f8bafc9..82d93f4 100644 (file)
--- a/src/ui/inc/FUiCtrl_ContextMenuListPresenter.h
+++ b/src/ui/inc/FUiCtrl_ContextMenuListPresenter.h
@@ -123,7 +123,10 @@ private:
        float __screenBottomMargin;
        float __screenLeftMargin;
        float __screenRightMargin;
-       float __arrowMargin;
+       float __arrowTopMargin;
+       float __arrowBottomMargin;
+       float __arrowRightMargin;
+       float __arrowLeftMargin;
        float __arrowWidth;
        float __arrowHeight;
        float __itemWidth;

diff --git a/src/ui/inc/FUi_ResourceContextMenuConfig.h b/src/ui/inc/FUi_ResourceContextMenuConfig.h
index fbd6848..10ea358 100755 (executable)
--- a/src/ui/inc/FUi_ResourceContextMenuConfig.h
+++ b/src/ui/inc/FUi_ResourceContextMenuConfig.h
@@ -80,7 +80,11 @@ DECLARE_UI_CONFIG(CONTEXTMENU);
        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_

diff --git a/src/ui/resource/FUi_ResourceContextMenuConfig.cpp b/src/ui/resource/FUi_ResourceContextMenuConfig.cpp
index 3fbbed1..b0b607d 100755 (executable)
--- a/src/ui/resource/FUi_ResourceContextMenuConfig.cpp
+++ b/src/ui/resource/FUi_ResourceContextMenuConfig.cpp
@@ -62,12 +62,12 @@ START_UI_CONFIG(CONTEXTMENU);
                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);
@@ -83,10 +83,10 @@ START_UI_CONFIG(CONTEXTMENU);
                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);
 
@@ -100,6 +100,10 @@ START_UI_CONFIG(CONTEXTMENU);
                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);