Fixed issue 46213 and popup changes

Change-Id: I8034106f7bb60340e97b276b62e6339bf2ee396d
Signed-off-by: Himanshu <himanshu.t@samsung.com>

diff --git a/res/screen-size-normal/IDL_FORM_ALBUM_NAME_EDITOR.xml b/res/screen-size-normal/IDL_FORM_ALBUM_NAME_EDITOR.xml
index 7e48710..011d6b6 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_ALBUM_NAME_EDITOR.xml
+++ b/res/screen-size-normal/IDL_FORM_ALBUM_NAME_EDITOR.xml
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201306281023" Dversion="20120315">
+<Scene Bversion="2.0.0.201307091413" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_ALBUM_NAME_EDITOR">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -20,7 +20,7 @@
     </Header>
     <EditField id="IDC_EDITFIELD_NAME" parent="IDL_FORM_ALBUM_NAME_EDITOR">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="255" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="100.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="21.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="100.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="None" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="None" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="21.0"/>
     </EditField>
 </Scene>

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index 55530cd..14fa78a 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -772,7 +772,7 @@ bool AlbumListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEve
 {
        AppLogDebug("ENTER");
 
-       if (keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC)
+       if (keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC || keyEventInfo.GetKeyCode() == KEY_BACKSPACE)
        {
                __pDeletePopup->SetShowState(false);
                __pDeletePopup->Show();

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index ef41843..297ba28 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -1145,7 +1145,7 @@ FileListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo
 {
        AppLogDebug("ENTER");
 
-       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC)
+       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC || keyEventInfo.GetKeyCode() == KEY_BACKSPACE)
        {
                _overlayMsg = false;
                __pDeletePopup->SetShowState(false);

diff --git a/src/GlSlideShowPopUp.cpp b/src/GlSlideShowPopUp.cpp
index 2a5a10e..48c9b4d 100644 (file)
--- a/src/GlSlideShowPopUp.cpp
+++ b/src/GlSlideShowPopUp.cpp
@@ -114,7 +114,7 @@ SlideShowPopUp::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& ke
 {
        AppLogDebug("ENTER");
 
-       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC)
+       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC || keyEventInfo.GetKeyCode() == KEY_BACKSPACE)
        {
                Popup::SetShowState(false);
                Popup::Show();