Changed to code review mail comments.

Change-Id: Ib27f15013fb5f3f9dd7ca430ae54724b5c1cc54d
Signed-off-by: clone <ingyou.park@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
index 9e9f1b9..4fd03b9 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
@@ -27,6 +27,7 @@
 #include "FUi_AccessibilityContainer.h"
 #include "FUi_AccessibilityElement.h"
 #include "FUi_CoordinateSystemUtils.h"
+#include "FUi_Math.h"
 #include "FUi_ResourceManager.h"
 #include "FUiCtrl_ActionEvent.h"
 #include "FUiCtrl_IActionEventListener.h"
@@ -146,7 +147,7 @@ _ContextMenuGridPresenter::LoadShape(void)
        GET_SHAPE_CONFIG(CONTEXTMENU::GRID_ITEM_MAX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemMaxWidth);
        GET_SHAPE_CONFIG(CONTEXTMENU::GRID_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __itemHeight);
        GET_SHAPE_CONFIG(CONTEXTMENU::GRID_TEXT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __itemTextMargin);
-       GET_SHAPE_CONFIG(CONTEXTMENU::GRID_ITEM_GAP, _CONTROL_ORIENTATION_PORTRAIT, __itemGap);
+       GET_FIXED_VALUE_CONFIG(CONTEXTMENU::GRID_ITEM_GAP, _CONTROL_ORIENTATION_PORTRAIT, __itemGap);
 
        GET_SHAPE_CONFIG(CONTEXTMENU::GRID_MIN_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __minWidth);
        GET_SHAPE_CONFIG(CONTEXTMENU::GRID_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __topMargin);
@@ -1219,7 +1220,7 @@ _ContextMenuGridPresenter::DrawItem(Tizen::Graphics::Canvas* pCanvas)
                }
 
                // horizontal line
-               if (linePositionY != rect.y)
+               if (!_FloatCompare(linePositionY, rect.y))
                {
                        linePositionY = rect.y;
 

diff --git a/src/ui/resource/FUi_ResourceContextMenuConfig.cpp b/src/ui/resource/FUi_ResourceContextMenuConfig.cpp
index 0c7acfb..9329154 100644 (file)
--- a/src/ui/resource/FUi_ResourceContextMenuConfig.cpp
+++ b/src/ui/resource/FUi_ResourceContextMenuConfig.cpp
@@ -91,10 +91,10 @@ START_UI_CONFIG(CONTEXTMENU);
                ADD_SHAPE_CONFIG(GRID_ICON_HEIGHT, 45);
 
                ADD_FIXED_VALUE_CONFIG(GRID_ITEM_GAP, 2);
-               ADD_FIXED_VALUE_CONFIG(SCREEN_TOP_MARGIN, 24);
-               ADD_FIXED_VALUE_CONFIG(SCREEN_BOTTOM_MARGIN, 24);
-               ADD_FIXED_VALUE_CONFIG(SCREEN_LEFT_MARGIN, 24);
-               ADD_FIXED_VALUE_CONFIG(SCREEN_RIGHT_MARGIN, 24);
+               ADD_SHAPE_CONFIG(SCREEN_TOP_MARGIN, 24);
+               ADD_SHAPE_CONFIG(SCREEN_BOTTOM_MARGIN, 24);
+               ADD_SHAPE_CONFIG(SCREEN_LEFT_MARGIN, 24);
+               ADD_SHAPE_CONFIG(SCREEN_RIGHT_MARGIN, 24);
 
                ADD_SHAPE_CONFIG(ANCHOR_WIDTH, 36);
                ADD_SHAPE_CONFIG(ANCHOR_HEIGHT, 36);