From 46a1ed2f4caa5f4c054796bd63a01d1905c60243 Mon Sep 17 00:00:00 2001 From: Myung Jin Kim Date: Fri, 31 May 2013 16:31:54 +0900 Subject: [PATCH] fix jira defect for longpress tab Change-Id: I792c1c903dddb4fc65869494457b44163e212f20 --- src/ui/controls/FUiCtrl_ToolbarPresenter.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp index 070e315..3f97838 100644 --- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp @@ -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); -- 2.7.4