Shifted the text in setting options in cameraCapture:N_SE-39512

Signed-off-by: rahul varna <rahul.varna@samsung.com>

diff --git a/project/src/Camera/CameraCaptureForm.cpp b/project/src/Camera/CameraCaptureForm.cpp
index 2fc7cfb..2056a8e 100644 (file)
--- a/project/src/Camera/CameraCaptureForm.cpp
+++ b/project/src/Camera/CameraCaptureForm.cpp
@@ -84,7 +84,7 @@ static const int ICON_HEIGHT = 100;
 static const int PORTRAIT_MODE = 0;
 static const int PORTRAIT_REVERSE_MODE = 1;
 static const int LANDSCAPE_MODE = 3;
-static const int POPUP_X_DISPLACEMENT = 10;
+static const int POPUP_X_DISPLACEMENT = 5;
 
 
 static const String FORM_ID = L"CameraCaptureForm";
@@ -616,7 +616,7 @@ CameraCaptureForm::AddListView(ListView** pListView, Popup* pPopup, int id)
        }
 
        //As Client area bounds gives us area from the margin of the popup.
-       r = pCtrl->Construct(Rectangle(POPUP_X_DISPLACEMENT, 0, popupRect.width, popupRect.height), true, false);
+       r = pCtrl->Construct(Rectangle(0, 0, popupRect.width, popupRect.height), true, false);
        TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO), "[%s] pCtrl->Construct",GetErrorMessage(r));
 
        SetCurrentListViewType(id);
@@ -775,7 +775,7 @@ CameraCaptureForm::CreateItem(int index, int itemWidth)
                        if (pItemValue != null)
                        {
                                AppLog("item name at %d = %ls", index, pItemValue->pItemName->GetPointer());
-                               r = pItem->AddElement(Rectangle(0, 0, itemWidth, LISTVIEW_ITEM_HEIGHT), pItemValue->elementId, *(pItemValue->pItemName), true);
+                               r = pItem->AddElement(Rectangle(POPUP_X_DISPLACEMENT, 0, itemWidth, LISTVIEW_ITEM_HEIGHT), pItemValue->elementId, *(pItemValue->pItemName), true);
                                TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO),"[%s] pItem->AddElement", GetErrorMessage(r));
                        }
 

diff --git a/project/src/Recorder/VideoRecorderForm.cpp b/project/src/Recorder/VideoRecorderForm.cpp
index 3e99704..8a31306 100644 (file)
--- a/project/src/Recorder/VideoRecorderForm.cpp
+++ b/project/src/Recorder/VideoRecorderForm.cpp
@@ -77,7 +77,7 @@ static const int VR_FORM_LISTVIEW_H  = 250;
 static const int MIN_THREAD_SLEEP_TIME = 200;
 static const int ENABLE_AUDIO_STREAM = 0;
 static const int DISABLE_AUDIO_STREAM = 1;
-static const int POPUP_X_DISPLACEMENT = 10;
+static const int POPUP_X_DISPLACEMENT = 5;
 
 static const String FORM_ID = L"VideoRecorderForm";
 extern const Tizen::Ui::Scenes::SceneId VIDEO_RECORDER_SCENE_ID = L"VideoRecorderScene";
@@ -985,7 +985,7 @@ VideoRecorderForm::AddListView(ListView** pListView, Popup* pPopup, int id)
                popupRect.height = VR_FORM_LISTVIEW_H;
        }
 
-       popupRect.x = POPUP_X_DISPLACEMENT; //As Client area bounds gives us area from the margin of the popup.
+       popupRect.x = 0;
        popupRect.y = 0;
 
        r = pCtrl->Construct(popupRect, true, false);
@@ -1161,7 +1161,7 @@ VideoRecorderForm::CreateItem(int index, int itemWidth)
                        if (pItemValue != null)
                        {
                                AppLog("item name at %d = %ls", index, pItemValue->pItemName->GetPointer());
-                               r = pItem->AddElement(Rectangle(0, 0, itemWidth, LISTVIEW_ITEM_HEIGHT), pItemValue->elementId, *(pItemValue->pItemName), true);
+                               r = pItem->AddElement(Rectangle(POPUP_X_DISPLACEMENT, 0, itemWidth, LISTVIEW_ITEM_HEIGHT), pItemValue->elementId, *(pItemValue->pItemName), true);
                                TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO), "[%s] pItem->AddElement", GetErrorMessage(r));
                        }
 
@@ -4540,7 +4540,7 @@ CATCH:
 void
 VideoRecorderForm::OnVideoRecorderCanceled(result r)
 {
-       AppLog("RECORDER_STATE_RECORDING");
+       AppLog("OnVideoRecorderCanceled");
        __pTimer->Cancel();
        FreeResources();
 }
@@ -4548,7 +4548,7 @@ VideoRecorderForm::OnVideoRecorderCanceled(result r)
 void
 VideoRecorderForm::OnVideoRecorderClosed(result r)
 {
-       AppLog("VideoRecorderForm::OnVideoRecorderClosed");
+       AppLog("OnVideoRecorderClosed");
 
        switch(__cameraError)
        {
@@ -4579,7 +4579,7 @@ VideoRecorderForm::OnVideoRecorderClosed(result r)
 void
 VideoRecorderForm::OnVideoRecorderEndReached(Tizen::Media::RecordingEndCondition endCondition)
 {
-       AppLog("VideoRecorderForm::OnVideoRecorderEndReached ");
+       AppLog("OnVideoRecorderEndReached ");
        __pVideoRecorder->Close();
        __pTimer->Cancel();
        SetFooterItem(2, L"Start", ID_START);
@@ -4591,7 +4591,7 @@ VideoRecorderForm::OnVideoRecorderEndReached(Tizen::Media::RecordingEndCondition
 void
 VideoRecorderForm::OnVideoRecorderErrorOccurred(Tizen::Media::RecorderErrorReason r)
 {
-       AppLog("VideoRecorderForm::OnVideoRecorderErrorOccurred");
+       AppLog("OnVideoRecorderErrorOccurred");
        __pVideoRecorder->Close();
        __pTimer->Cancel();
 
@@ -4601,7 +4601,7 @@ VideoRecorderForm::OnVideoRecorderErrorOccurred(Tizen::Media::RecorderErrorReaso
 void
 VideoRecorderForm::OnVideoRecorderPaused(result r)
 {
-       AppLog("VideoRecorderForm::OnVideoRecorderPaused");
+       AppLog("OnVideoRecorderPaused");
 }
 
 void
@@ -4631,7 +4631,7 @@ void
 VideoRecorderForm::OnVideoRecorderStopped(result r)
 {
        Footer* pFotter = null;
-       AppLog("VideoRecorderForm::OnVideoRecorderStopped ");
+       AppLog("OnVideoRecorderStopped ");
        SendUserEvent(RECORDER_ON_STOP, null);
        ShowFooterItem(0, true);
        if (__cameraCount > 1)  //if camera count is 2 then only use secondary camera.