fix jira defect for longpress tab
authorMyung Jin Kim <critical.kim@samsung.com>
Fri, 31 May 2013 07:31:54 +0000 (16:31 +0900)
committerMyung Jin Kim <critical.kim@samsung.com>
Fri, 31 May 2013 07:31:54 +0000 (16:31 +0900)
Change-Id: I792c1c903dddb4fc65869494457b44163e212f20

src/ui/controls/FUiCtrl_ToolbarPresenter.cpp

index 070e315..3f97838 100644 (file)
@@ -1563,6 +1563,7 @@ bool
 _ToolbarPresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& touchinfo)
 {
        __touchInitiatedInToolbar = false;
+       __beingEdited = false;
 
        // Restore status of other buttons to _BUTTON_STATUS_NORMAL             // this can be removed
        int itemCount = __pToolbar->GetItemCount();
@@ -1575,6 +1576,14 @@ _ToolbarPresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& tou
                }
        }
 
+       if (__pEditItem)
+       {
+               __pToolbar->DetachChild(*__pEditItem);
+
+               delete __pEditItem;
+               __pEditItem = null;
+       }
+
        // Update children
        __pToolbar->Invalidate(true);