N_SE-39869,N_SE-39895,N_SE-39767,N_SE-39765,N_SE-38985

Change-Id: I9e7e909b25d42f9db1de7f5f1554c3c6d0edda1f

diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp
index 0c0c003..c088890 100755 (executable)
--- a/src/ClEventDeleterForm.cpp
+++ b/src/ClEventDeleterForm.cpp
@@ -292,13 +292,17 @@ EventDeleterForm::GetGroupCount(void)
        if (groupCount == 1 && __pPm->GetEventWithWholeIndex(0, 0) == null)
        {
                groupCount = 0;
+
        }
 
        if (groupCount != 0 && __topBottomItemEnabled == true)
        {
                groupCount += TOP_BOTTOM_GROUP_ITEM_COUNT;
        }
-
+       if(groupCount == 0 && __pTwoButtonPopup != NULL)
+       {
+               __pTwoButtonPopup->SetShowState(false);
+       }
        return groupCount;
 }
 

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 8773638..25748d5 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -923,7 +923,7 @@ void
 EventEditorForm::OnActionPerformed(const Control& source, int actionId)
 {
        AppLogDebug("Enter.");
-       SetFocus();
+
        result r = E_SUCCESS;
        switch (actionId)
        {
@@ -1029,6 +1029,7 @@ EventEditorForm::OnActionPerformed(const Control& source, int actionId)
                break;
        }
        }
+       SetFocus();
 }
 
 TableViewItem*

diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp
index 8a79679..629f1fd 100644 (file)
--- a/src/ClMonthPanel.cpp
+++ b/src/ClMonthPanel.cpp
@@ -1014,6 +1014,7 @@ MonthPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cur
                }
        }
 
+       __pListViewEvent->UpdateList();
        __pPanningAnimationManager->ResetPosition();
 
        Form* pForm = static_cast<Form*>(GetParent());