From: Keuckdo Bang <keuckdo.bang@samsung.net>
Date: Thu, 30 May 2013 12:16:18 +0000 (+0900)
Subject: delete virtual keyword.
X-Git-Tag: accepted/tizen/20130924.144426~1^2~680^2~59^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c639e147c2d5d890edb8863316d8a84d8a40973;p=platform%2Fframework%2Fnative%2Fuifw.git

delete virtual keyword.

Change-Id: I2b3d17255ce7a2b3d0fb011c9512263aa9ed55e8
---

diff --git a/src/ui/FUi_DimmingLayer.cpp b/src/ui/FUi_DimmingLayer.cpp
index a09def9..9ed709b 100644
--- a/src/ui/FUi_DimmingLayer.cpp
+++ b/src/ui/FUi_DimmingLayer.cpp
@@ -196,7 +196,7 @@ _DimmingLayer::SetDimmingEnabled(bool enabled)
 		{
 			if (pCanvas)
 			{
-				r = pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, size.width, size.height), *pLandscapeBitmap);
+				r = pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, size.height, size.width), *pLandscapeBitmap);
 			}
 		}
 
diff --git a/src/ui/controls/FUiCtrl_Indicator.cpp b/src/ui/controls/FUiCtrl_Indicator.cpp
index 54a2793..d2975e2 100644
--- a/src/ui/controls/FUiCtrl_Indicator.cpp
+++ b/src/ui/controls/FUiCtrl_Indicator.cpp
@@ -75,9 +75,6 @@ _Indicator::CreateIndicator(void)
 	r = pIndicator->ConstructControlVisualElement();
 	SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-	pIndicator->SetSurfaceOpaque(false);
-	pIndicator->SetOpacity(1.0f);
-
 	pIndicator->SetBackgroundColor(_Colorf((float)bgColor.GetRed() / 255.0f, (float)bgColor.GetGreen() / 255.0f, (float)bgColor.GetBlue() / 255.0f, (float)bgColor.GetAlpha() / 255.0f));
 
 	return pIndicator;
@@ -520,7 +517,7 @@ _Indicator::OnMessageHandle(Ecore_Evas *pEe, int msgDomain, int msgId, void *dat
 		{
 			IndicatorTypeMode *pIndicatorTypeMode = (IndicatorTypeMode*)(data);
 
-			_Window* pWindow = 	_ControlManager::GetInstance()->_ControlManager::GetCurrentFrame();
+			_Window* pWindow = 	_ControlManager::GetInstance()->_ControlManager::GetTopVisibleWindow();
 			SysTryReturnVoidResult(NID_UI_CTRL, pWindow, E_INVALID_STATE, "[E_INVALID_STATE] Indicator is not attached main tree.");
 
 			Ecore_X_Window win = (Ecore_X_Window)pWindow->GetNativeHandle();
diff --git a/src/ui/inc/FUiCtrl_Indicator.h b/src/ui/inc/FUiCtrl_Indicator.h
index e9faf9d..c42af3b 100644
--- a/src/ui/inc/FUiCtrl_Indicator.h
+++ b/src/ui/inc/FUiCtrl_Indicator.h
@@ -65,8 +65,8 @@ public:
 		Tizen::Graphics::Rectangle GetIndicatorBounds(void) const;
 		Tizen::Graphics::FloatRectangle GetIndicatorBoundsF(void) const;
 
-		virtual void OnChangeLayout(_ControlOrientation orientation);
-		virtual result OnAttachedToMainTree(void);
+		void OnChangeLayout(_ControlOrientation orientation);
+		result OnAttachedToMainTree(void);
 		virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 		static void OnDisconnected(Ecore_Evas *pEe);
 		static void OnMessageHandle(Ecore_Evas *pEe, int msgDomain, int msgId, void *data, int size);