From: MANISH KUMAR <kr.manish@samsung.com>
Date: Tue, 16 Jul 2013 11:41:04 +0000 (+0530)
Subject: Nabi issue 46564 fix
X-Git-Tag: 2.2_release~17
X-Git-Url: http://review.tizen.org/git/?p=apps%2Fosp%2FGallery.git;a=commitdiff_plain;h=8963b717a07d5e77f81018c3a97373cbbade591e

Nabi issue 46564 fix

Change-Id: Icbeb84c0753c6db2094dbef265c52e3244b903a1
Signed-off-by: MANISH KUMAR <kr.manish@samsung.com>
---

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index 1130a56..3ce1d2f 100644
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -333,7 +333,7 @@ AlbumNameEditorForm::OnRenameAlbum(String& strOri)
 	else
 	{
 		//Add a popup here
-		Rectangle clientRect = GetClientAreaBounds();
+		Rectangle clientRect = Form::GetBounds();
 		Rectangle rect(0, 0, clientRect.width, clientRect.height);
 		__pProgressAnim = new (std::nothrow) ProgressAnimation;
 		__pProgressAnim->Construct(rect);
@@ -695,9 +695,9 @@ AlbumNameEditorForm::CreateMessage(String& str)
 void
 AlbumNameEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
-	if (__pProgressAnim != NULL)
+	if (__pProgressAnim != null)
 	{
-		__pProgressAnim->ChangeOrientation(GetClientAreaBounds());
+		__pProgressAnim->ChangeOrientation(Form::GetBounds());
 		__pProgressAnim->Invalidate(true);
 	}
 }
diff --git a/src/GlProgressAnimation.cpp b/src/GlProgressAnimation.cpp
index 465706c..73352bc 100644
--- a/src/GlProgressAnimation.cpp
+++ b/src/GlProgressAnimation.cpp
@@ -185,7 +185,7 @@ ProgressAnimation::Construct(Tizen::Graphics::Rectangle rect)
 
 		// Create Animation
 		__pAnimation = new (std::nothrow) Animation();
-		__pAnimation->Construct(Rectangle((rect.width / 2 - 60 / 2), (rect.height / 2 + 30), 60, 60), *__pAnimationFrameList);
+		__pAnimation->Construct(Rectangle((rect.width / 2 - 60 / 2), (rect.height / 2 - 30), 60, 60), *__pAnimationFrameList);
 		__pAnimation->SetRepeatCount(10000);
 		AddControl(__pAnimation);
 	}
@@ -211,6 +211,6 @@ void
 ProgressAnimation::ChangeOrientation(Tizen::Graphics::Rectangle rect)
 {
 	Panel::SetBounds(rect);
-	__pAnimation->SetBounds((rect.width / 2 - 60 / 2), (rect.height / 2 + 30), 60, 60);
+	__pAnimation->SetBounds((rect.width / 2 - 60 / 2), (rect.height / 2 - 30), 60, 60);
 	__pAnimation->Invalidate(true);
 }