Fixed Nabi Issues

Change-Id: I9c943dc562d9a4dd418ed86b774f124f64f4546a
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/res/screen-size-normal/IDL_SHARE_POPUP.xml b/res/screen-size-normal/IDL_SHARE_POPUP.xml
index 84252fe..bc68a37 100644 (file)
--- a/res/screen-size-normal/IDL_SHARE_POPUP.xml
+++ b/res/screen-size-normal/IDL_SHARE_POPUP.xml
@@ -3,20 +3,20 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
-<ScenePopup Bversion="2.0.0.201304161803" Dversion="20120315">
-    <Popup id="IDL_POPUP_LIST">
+<ScenePopup Bversion="2.0.0.201304191935" Dversion="20120315">
+    <Popup id="IDL_SHARE_POPUP">
         <property accessibilityHint="" color="" titleText="::IDS_BR_OPT_SHARE" titleTextColor=""/>
         <layout height="350.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="680.0"/>
         <layout height="350.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="680.0"/>
     </Popup>
-    <Button id="IDC_BUTTON1" parent="IDL_POPUP_LIST">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Close" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDL_POPUP_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="143.0" y="174.0"/>
+    <Button id="IDC_BUTTON1" parent="IDL_SHARE_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_POP_CLOSE" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="143.0" y="174.0"/>
         <layout bottomRelation="IDL_POPUP_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="143.0" y="174.0"/>
     </Button>
-    <ListView id="IDC_LISTVIEW" parent="IDL_POPUP_LIST">
+    <ListView id="IDC_LISTVIEW" parent="IDL_SHARE_POPUP">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="IDC_BUTTON1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_POPUP_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="0" y="0.0"/>
+        <layout bottomRelation="IDC_BUTTON1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="0" y="0.0"/>
         <layout bottomRelation="IDC_BUTTON1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_POPUP_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_POPUP_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_POPUP_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="0.0" y="0.0"/>
     </ListView>
 </ScenePopup>

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 9f4bb18..318fd95 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -653,9 +653,6 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_CANCEL:
        {
-
-               __pAddressbarUrlField->SetText(__displayUrl);
-               __editTextUrl = L"";
                __pAddressbarUrlField->HideKeypad();
                __pListener->OnAddressCancelledClicked(*this);
                //SetAddressbarMode(ADDRESSBAR_MODE_LOADING_COMPLETE);
@@ -715,12 +712,14 @@ Addressbar::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::Keypa
 void
 Addressbar::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-       if(__isClipboardOpen == true)
+       if (__isClipboardOpen == true)
        {
                __isClipboardOpen = false;
                __pListener->OnClipboardClosed(*this);
                return;
        }
+       __pAddressbarUrlField->SetText(__displayUrl);
+       __editTextUrl = L"";
        SetShowState(false);
        if(__pListener != null)
        {

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 5b7b24f..6122fbf 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -281,10 +281,6 @@ HistoryListForm::OnActionPerformed(const Control& source, int actionId)
 
                        }
                }
-
-
-
-
 //             r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
                if (IsFailed(r))
                {
@@ -971,7 +967,11 @@ HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode)
        result r = E_FAILURE;
        if (mode == SEARCH_BAR_MODE_NORMAL)
        {
-               //              __pSearchBar->SetMode(SEARCH_BAR_MODE_INPUT);
+               if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false)
+               {
+                       __pSearchListView->SetEnabled(true);
+               }
+
                r = __pSearchListView->SetShowState(false);
                if (IsFailed(r))
                {
@@ -1191,12 +1191,7 @@ HistoryListForm::OnKeypadOpened(Control& source)
 void
 HistoryListForm::OnKeypadClosed(Control& source)
 {
-       if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false)
-       {
-               //              __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
-               __pSearchListView->SetEnabled(true);
-
-       }
+       
        GetFooter()->SetShowState(true);
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->Invalidate(false);