Changed to give margin to top and lower item everytime.
authorclone <ingyou.park@samsung.com>
Mon, 13 May 2013 06:07:30 +0000 (15:07 +0900)
committerclone <ingyou.park@samsung.com>
Mon, 13 May 2013 06:07:30 +0000 (15:07 +0900)
Change-Id: Ia7e415e94c4111dd42684af84193165ceb9d5f67
Signed-off-by: clone <ingyou.park@samsung.com>
src/ui/controls/FUiCtrl_ContextMenuItem.cpp

index c37cf69..ed4a8cf 100644 (file)
@@ -371,16 +371,6 @@ _ContextMenuItem::DrawItemBackground(void)
 
        SetBackgroundColor(Color(0, 0, 0, 0));
 
-       if (!__upperDividerLine)
-       {
-               topMargin = __bgPressedMargin;
-       }
-
-       if (!__lowerDividerLine)
-       {
-               bottomMargin = __bgPressedMargin;
-       }
-
        if (__pBackgroundLabel == null)
        {
                __pBackgroundLabel = _Label::CreateLabelN();
@@ -402,26 +392,21 @@ _ContextMenuItem::DrawItemBackground(void)
        FloatRectangle boundsScrollPanel = pScrollPanel->GetBoundsF();
 
        float topOverlap = pScrollPanel->GetScrollPosition() - bounds.y;
-       if (!_FloatCompareLE(topOverlap, 0.0f))
+       if (topOverlap > 0.0f)
        {
-               topMargin = topOverlap;
+               topMargin = topOverlap + __bgPressedMargin;
        }
-       else
+       else if (!__upperDividerLine)
        {
-               topOverlap = 0.0f;
+               topMargin = __bgPressedMargin;
        }
 
        float bottomOverlap = bounds.y + bounds.height - (pScrollPanel->GetScrollPosition() + boundsScrollPanel.height);
-       if (!_FloatCompareLE(bottomOverlap, 0.0f))
+       if (bottomOverlap > 0.0f) 
        {
-               bottomMargin = bottomOverlap;
+               bottomMargin = bottomOverlap + __bgPressedMargin;
        }
-       else
-       {
-               bottomOverlap = 0.0f;
-       }
-
-       if (!__lowerDividerLine && _FloatCompare(bottomOverlap, __dividerHeight * 2.0f))
+       else if (!__lowerDividerLine)
        {
                bottomMargin = __bgPressedMargin;
        }