FCL/sf/app/jrt: comparison javauis/mmapi_qt/baseline/src/cmmadisplay.cpp

equal deleted inserted replaced

-:98ccebc37403
+:dc7c549001d5
 #include <w32std.h>
 // Destructor (virtual by CBase)
 CMMADisplay::~CMMADisplay()
 {
 /*
 if (iDirectContainer)
 {
 // Remove clip rect if set
 if (!iClipRect.IsEmpty())
 {
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::~CMMADisplay(): Removing clip rect");
 iDirectContainer->MdcRemoveContentBounds(iClipRect);
 }
 // Remove this object from MDirectContainer
 iDirectContainer->MdcRemoveContent(this);
 }
 */
 }
 CMMADisplay::CMMADisplay():
 iVisible(ETrue),
 {
 }
 void CMMADisplay::Construct(MMAFunctionServer* eventSource , jobject javadisplayref)
 {
-	iEventSource = eventSource;
+iEventSource = eventSource;
-	iJni = iEventSource->getValidJniEnv();
+iJni = iEventSource->getValidJniEnv();
-	iJavaDisplayObject = iJni->NewGlobalRef(javadisplayref);
+iJavaDisplayObject = iJni->NewGlobalRef(javadisplayref);
-	iJavaDisplayClass = iJni->GetObjectClass(iJavaDisplayObject);
+iJavaDisplayClass = iJni->GetObjectClass(iJavaDisplayObject);
 // Components must have direct content.
 /* __ASSERT_LOG(EJavaMMAPI,EInfo,"aDirectContainer, User::Invariant());
 // Not owned
 iDirectContainer = aDirectContainer;
 // Get component visibility. Later visibility changes will
 // be informed through MDirectContent observer.
 iContainerVisible = iDirectContainer->MdcContainerVisibility();
 LOG1(EJavaMMAPI,EInfo,"MID::CMMADisplay::Construct iContainerVisible = %d", iContainerVisible);
 LOG1(EJavaMMAPI,EInfo,"MID::CMMADisplay::Construct iVisible = %d", iVisible);
 // Add this MDirectContent to the MDirectContainer. Cannot fail.
 iDirectContainer->MdcAddContent(this);
 */
 }
 TRect CMMADisplay::ScaleToFullScreen(const TSize& aFullScreenSize,
 const TSize& aSourceSize)
 {
-	LOG(EJavaMMAPI,EInfo,"CMMADisplay::ScaleToFullScreen() +");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::ScaleToFullScreen() +");
 if ((aSourceSize.iWidth == 0) &&
 (aSourceSize.iHeight == 0))
 {
 // Avoid divide by zero.
 return TRect();
 if (!iWindow ||
 (iWindow->GetDisplayWindowType() == MMMADisplayWindow::EDisplayWindowTypeIsBitmap) ||
 iClipRect == iWindow->DrawRect() && iContainerVisible && iVisible)
 {
-	 LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion before return");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion before return");
-	     return;
+return;
 }
 TBool refreshScreen(EFalse);
 // Remove first the current clip rect if set
 LOG2(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: iClipRect = %d X %d",iClipRect.Width(),iClipRect.Height());
 if (!iClipRect.IsEmpty())
 {
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: Removing old rect");
 //iDirectContainer->MdcRemoveContentBounds(iClipRect);
 iClipRect.SetRect(0, 0, 0, 0);
 refreshScreen = ETrue;
 }
 // If visible then set a new clip rect
 if (iVisible && iContainerVisible)
 {
-	LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: inside if (iVisible && iContainerVisible)");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: inside if (iVisible && iContainerVisible)");
 iClipRect = iWindow->DrawRect();
 LOG2(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: inside if (iVisible && iContainerVisible)iClipRect = %d X %d",iClipRect.Width(),iClipRect.Height());
 if (!iClipRect.IsEmpty())
 {
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: Adding new rect");
 // Add new clipping rect
 //   iDirectContainer->MdcAddContentBounds(iClipRect);
 SetContentBoundToJavaControl(iClipRect);
 refreshScreen = ETrue;
 }
 }
 if (refreshScreen)
 {
-	LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: inside if(refreshScreen)");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion: inside if(refreshScreen)");
 // refresh screen
 // iDirectContainer->MdcFlushContainer(iWindow->WindowRect());
-RefreshJavaControl(iWindow->WindowRect());
+RefreshJavaControl();
 }
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetClippingRegion -");
 }
 void CMMADisplay::RemoveClippingRegion()
 //iDirectContainer->MdcRemoveContentBounds(iClipRect);
 RemoveContentBoundFromJavaControl(iClipRect);
 iClipRect.SetRect(0, 0, 0, 0);
 // refresh screen
 //iDirectContainer->MdcFlushContainer(iWindow->WindowRect());
-RefreshJavaControl(iWindow->WindowRect());
+RefreshJavaControl();
 }
 }
 void CMMADisplay::AddClippingRegion()
 {
 // Called in mmapi thread
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::AddClippingRegion");
-		LOG2(EJavaMMAPI,EInfo,"CMMADisplay::AddClippingRegion iClipRect width = %d height = %d", iClipRect.Width() , iClipRect.Height());
+LOG2(EJavaMMAPI,EInfo,"CMMADisplay::AddClippingRegion iClipRect width = %d height = %d", iClipRect.Width() , iClipRect.Height());
 if (!iWindow ||
 (iWindow->GetDisplayWindowType() ==
 MMMADisplayWindow::EDisplayWindowTypeIsBitmap) ||
 iClipRect == iWindow->DrawRect())
 {
 iClipRect = iWindow->DrawRect();
 if (!iClipRect.IsEmpty())
 {
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::AddClippingRegion: Adding new rect");
 // Add new clipping rect
 // iDirectContainer->MdcAddContentBounds(iClipRect);
 SetContentBoundToJavaControl(iClipRect);
 // refresh screen
 // iDirectContainer->MdcFlushContainer(
 //     iWindow->WindowRect());
-RefreshJavaControl(iWindow->WindowRect());
+RefreshJavaControl();
 }
 }
 }
 // from MMMADisplay
 // from MMMADisplay
 void CMMADisplay::SetDisplaySizeL(const TSize& aSize)
 {
 // user rect contains size set from java.
 iUserRect.SetSize(aSize);
 LOG2(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetDisplaySizeL iUserRect = %d X %d", iUserRect.Width() ,iUserRect.Height());
 // Size change has no effect if fullscreen mode is on.
 // New size could be used when fullscreen is turned off.
 if (iContainerVisible && !iFullScreen && iWindow)
 {
-	 	LOG1(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetVisible + iContainerVisible = %d", iContainerVisible);
+LOG1(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetVisible + iContainerVisible = %d", iContainerVisible);
 RemoveClippingRegion();
 LOG2(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetDisplaySizeL iUserRect after removingClipRegion = %d X %d", iUserRect.Width() ,iUserRect.Height());
 iWindow->SetDrawRect(iUserRect);
 AddClippingRegion();
 LOG2(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetDisplaySizeL iUserRect after AddingClipRegion = %d X %d", iUserRect.Width() ,iUserRect.Height());
 }
 else
 {
-	 LOG1(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetVisible + iContainerVisible = %d", iContainerVisible);
+LOG1(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetVisible + iContainerVisible = %d", iContainerVisible);
 iResetDrawRect = ETrue;
 }
 }
 // from MMMADisplay
 return;
 }
 // if not it can not be set visible.
 if (iWindow && iContainerVisible)
 {
 // iWindow->SetVisible(aValue, EFalse);
 //MMAPI UI 3.x req. (had to comment above line and add below line which excutes in FS thread)
 iWindow->SetVisible(aValue, ETrue);
 SetClippingRegion();
+LOG(EJavaMMAPI,EInfo,"MID::CMMADisplay::SetVisible -");
 }
 }
 void CMMADisplay::SetContainerVisibility(TBool aValue)
 {
-	iContainerVisible = aValue;
+iContainerVisible = aValue;
-	// TODO : delete the below check once implementation is done as it is used only for testing purpose
+// TODO : delete the below check once implementation is done as it is used only for testing purpose
-	if(iContainerVisible)
+if (iContainerVisible)
-	LOG(EJavaMMAPI,EInfo,"CMMADisplay:SetContainerVisibility(): Container is visible ");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay:SetContainerVisibility(): Container is visible ");
-	else
+else
-	LOG(EJavaMMAPI,EInfo,"CMMADisplay:SetContainerVisibility(): Container is not visible ");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay:SetContainerVisibility(): Container is not visible ");
-	HandleContainerVisibilityChanged(aValue);
+HandleContainerVisibilityChanged(aValue);
 }
 // from MMMADisplay
 void CMMADisplay::SetWindowL(MMMADisplayWindow* aWindow)
 {
 // Sets new window. Ownership is not transferred.
 return iFullScreen;
 }
 TBool CMMADisplay::HasContainer()
 {
 // return iDirectContainer != NULL;
 return EFalse;   // temporary
 }
-void CMMADisplay::HandleContainerVisibilityChanged( TBool aVisible )
+void CMMADisplay::HandleContainerVisibilityChanged(TBool aVisible)
 {
 LOG1(EJavaMMAPI,EInfo, "CMMADisplay::HandleContainerVisibilityChanged aVisible = %d",
-					                                            aVisible );
+aVisible);
-if(!iIsForeground && aVisible)
+if (!iIsForeground && aVisible)
 {
 LOG(EJavaMMAPI,EInfo," CMMADisplay::HandleContainerVisibilityChanged Condition 1 ");
 return;
 }
 LOG(EJavaMMAPI,EInfo," CMMADisplay::HandleContainerVisibilityChanged After condition1");
 if (iWindow)
 {
 if (aVisible != iWindow->IsVisible())
 {
 // Allow
 LOG(EJavaMMAPI,EInfo,"MID::CMMADisplay::MdcContainerVisibilityChanged Allow ");
 }
-else if( iContainerVisible == aVisible )
+else if (iContainerVisible == aVisible)
 {
 LOG(EJavaMMAPI,EInfo,"MID::CMMADisplay::MdcContainerVisibilityChanged iContainerVisible == aVisible ");
 // if state is not changed, we do not need to do it again
 return;
 }
 // To be overwritten if used
 __ASSERT_LOG(EJavaMMAPI,EInfo,"EFalse, User::Invariant());
 }
 void CMMADisplay::MdcContainerWindowRectChanged(const TRect&
-	                                              #ifdef RD_JAVA_NGA_ENABLED
+#ifdef RD_JAVA_NGA_ENABLED
-	                                               aRect
+aRect
-	                                              #endif
+#endif
-	                                              )
+)
 {
 LOG(EJavaMMAPI,EInfo,"CMMADisplay::MdcContainerWindowRectChanged +");
 #ifdef RD_JAVA_NGA_ENABLED
 if( iWindow )
-	{
+{
-	LOG(EJavaMMAPI,EInfo,"CMMADisplay::MdcContainerWindowRectChanged, SetRWindowRect");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::MdcContainerWindowRectChanged, SetRWindowRect");
-	iWindow->SetRWindowRect(aRect, MMMADisplay::EUiThread);
+iWindow->SetRWindowRect(aRect, MMMADisplay::EUiThread);
-	}
+}
 #endif
 }
 void CMMADisplay::MdcContainerDestroyed()
 {
 LOG(EJavaMMAPI,EInfo,"MMA::CMMADisplay::MdcContainerDestroyed");
 */
 void CMMADisplay::GetCallbackInUiThread(TInt placeholder)
 {
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::GetCallbackInUiThread +");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::GetCallbackInUiThread +");
-	 jmethodID getCallBackMethodID = iJni->GetMethodID(
+jmethodID getCallBackMethodID = iJni->GetMethodID(
 iJavaDisplayClass,
 "GetCallbackInUiThread",
 "(I)V");
 // LOG1(EJavaMMAPI,EInfo,"CMMADisplay::GetCallbackInUiThread getCallBackMethodID = %d",getCallBackMethodID);
 iJni->CallVoidMethod(iJavaDisplayObject,getCallBackMethodID,placeholder);
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::GetCallbackInUiThread -");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::GetCallbackInUiThread -");
 }
 void CMMADisplay::CalledBackInUiThread(TInt placeholder)
 {
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::CalledBackInUiThread +");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::CalledBackInUiThread +");
-		iWindow->UICallback(placeholder);
+iWindow->UICallback(placeholder);
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::CalledBackInUiThread -");
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::CalledBackInUiThread -");
 }
-void CMMADisplay::SourceSizeChanged(TInt aJavaControlWidth, TInt aJavaControlHeight)
-	{
-		LOG2(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged(aSourceSize,aJavaControlWidth,aJavaControlHeight) + aJavaControlWidth = %d ,aJavaControlHeight = %d",aJavaControlWidth,aJavaControlHeight);
+void CMMADisplay::SetWindowResources(QWidget* qtWidget)
-		iSourceSize = SourceSize();
+{
-		LOG2(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged(aSourceSize,aJavaControlWidth,aJavaControlHeight) + sourcesize = %d X %d",iSourceSize.iWidth , iSourceSize.iHeight);
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetWindowResources +");
-		#ifdef RD_JAVA_NGA_ENABLED
+CCoeControl* control = 0;
-if ( iWindow )
+if (qtWidget && qtWidget ->winId())
-			{
+{
-	iWindow->SetVideoCropRegion( TRect( iUserRect.iTl, iSourceSize ) );
+control = reinterpret_cast<CCoeControl*>(qtWidget->winId());
-	}
+}
-#endif
+CCoeEnv *coeEnv = control->ControlEnv();
-// size of canvas in java
+RWsSession * iWs = &(coeEnv->WsSession());
-TSize canvasSize(aJavaControlWidth, aJavaControlHeight);
+CWsScreenDevice* iScreenDevice = coeEnv->ScreenDevice();
-fullScreenSize = canvasSize;
+RWindowBase* window = static_cast<RWindowBase*>(control->DrawableWindow());
-TBool sourceIsBigger = (iSourceSize.iWidth > fullScreenSize.iWidth ||
+if (!iWindow)
-iSourceSize.iHeight > fullScreenSize.iHeight);
+{
+return;
+}
+iWindow->ProcureWindowResourcesFromQWidget(iWs,iScreenDevice,window);
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetWindowResources -");
+}
+void CMMADisplay::SetForeground(TBool aForeground, TBool aUseEventServer)
+{
+LOG1(EJavaMMAPI,EInfo,"MMA::CMMADisplay::SetForeground %d", aForeground);
+iIsForeground = aForeground;
+if (aForeground)
+{
+if (iContainerVisible && !iWindow->IsVisible())
+{
+iWindow->SetVisible(ETrue, aUseEventServer);
+}
+}
+else
+{
+if (iWindow->IsVisible())
+{
+iWindow->SetVisible(EFalse, aUseEventServer);
+}
+}
+}
+TSize CMMADisplay::SourceSize()
+{
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetSourceSizeToDisplay ");
+return iUiPlayer->SourceSize();
+}
+void CMMADisplay::SetUIPlayer(MMMAGuiPlayer* player)
+{
+iUiPlayer = player;
+}
+void CMMADisplay::SourceSizeChanged(const TSize& aSourceSize)
+{
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged");
+#ifdef RD_JAVA_NGA_ENABLED
+if (iWindow)
+{
+iWindow->SetVideoCropRegion(TRect(iUserRect.iTl, aSourceSize));
+}
+#endif
+iSourceSize = aSourceSize;
+LOG1(EJavaMMAPI,EInfo,"MMA::CMMADisplay::SourceSizeChanged %d",
+aSourceSize.iWidth);
+LOG1(EJavaMMAPI,EInfo,"MMA::CMMADisplay::SourceSizeChanged %d",
+aSourceSize.iHeight);
+jmethodID getDisplayWidthID = iJni->GetMethodID(
+iJavaDisplayClass,
+"getDisplayWidth",
+"()I");
+jmethodID getDisplayHeightID = iJni->GetMethodID(
+iJavaDisplayClass,
+"getDisplayHeight",
+"()I");
+TInt x =  iJni->CallIntMethod(iJavaDisplayObject,getDisplayWidthID);
+TInt y = iJni->CallIntMethod(iJavaDisplayObject,getDisplayHeightID);
+LOG2(EJavaMMAPI,EInfo,"CMMADisplay.cpp : SourceSizeChanged () iFullScreenSize is x = %d ,y = %d ",x,y);
+// get the ScreenSize from canvas in java
+TSize canvasSize(x, y);
+iFullScreenSize = canvasSize;
+TBool sourceIsBigger = (aSourceSize.iWidth > iFullScreenSize.iWidth ||
+aSourceSize.iHeight > iFullScreenSize.iHeight);
 if (sourceIsBigger)
 {
 // Source is larger than display area.
 // Shrink draw are to fit in display.
-iWindow->SetDrawRect(ScaleToFullScreen(fullScreenSize, iSourceSize));
+iWindow->SetDrawRect(ScaleToFullScreen(iFullScreenSize, iSourceSize));
 }
 else
 {
 // source is smaller than display area
 iWindow->SetDrawRect(TRect(iUserRect.iTl, iSourceSize));
 {
 // Addjusting rect to top left corner.
 iUserRect = TRect(iUserRect.Size());
 }
 }
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged(aSourceSize,aJavaControlWidth,aJavaControlHeight) -");
+}
-	}
-void CMMADisplay::SetWindowResources(QWidget* qtWidget)
-	{
+void CMMADisplay::SetDisplayPosition(TInt /*uiControlLocationX*/,TInt /*uiControlLocationY*/,TInt   videoControlLocationX,TInt videoControlLocationY)
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetWindowResources +");
+{
-		CCoeControl* control = 0;
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged + ");
-		if(qtWidget && qtWidget ->winId())
+TPoint point(videoControlLocationX ,videoControlLocationY);
-			{
+//calling derived class fuction
-				control = reinterpret_cast<CCoeControl*>(qtWidget->winId());
+TRAP_IGNORE(SetDisplayLocationL(point));
-			}
+LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged - ");
-		CCoeEnv *coeEnv = control->ControlEnv();
-		RWsSession * iWs = &(coeEnv->WsSession());
-		CWsScreenDevice* iScreenDevice = coeEnv->ScreenDevice();
-RWindowBase* window = static_cast<RWindowBase*>(control->DrawableWindow());
-if (!iWindow)
-{
-return;
-}
-iWindow->ProcureWindowResourcesFromQWidget(iWs,iScreenDevice,window);
-LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetWindowResources -");
-	}
-void CMMADisplay::SetForeground(TBool aForeground, TBool aUseEventServer)
-{
-LOG1(EJavaMMAPI,EInfo,"MMA::CMMADisplay::SetForeground %d", aForeground);
-iIsForeground = aForeground;
-if (aForeground)
-{
-if (iContainerVisible && !iWindow->IsVisible())
-{
-iWindow->SetVisible(ETrue, aUseEventServer);
-}
-}
-else
-{
-if (iWindow->IsVisible())
-{
-iWindow->SetVisible(EFalse, aUseEventServer);
-}
-}
-}
-TSize CMMADisplay::SourceSize()
-	{
-		LOG(EJavaMMAPI,EInfo,"CMMADisplay::SetSourceSizeToDisplay ");
-		 return iUiPlayer->SourceSize();
-	}
-void CMMADisplay::SetUIPlayer(MMMAGuiPlayer* player)
-	{
-		iUiPlayer = player;
-	}
-void CMMADisplay::SourceSizeChanged(const TSize& aSourceSize)
-{
-LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged");
-		#ifdef RD_JAVA_NGA_ENABLED
-if ( iWindow )
-			{
-	iWindow->SetVideoCropRegion( TRect( iUserRect.iTl, aSourceSize ) );
-	}
-#endif
-iSourceSize = aSourceSize;
-jmethodID getDisplayWidthID = iJni->GetMethodID(
-iJavaDisplayClass,
-"getDisplayWidth",
-"()I");
-jmethodID getDisplayHeightID = iJni->GetMethodID(
-iJavaDisplayClass,
-"getDisplayHeight",
-"()I");
-TInt x =  iJni->CallIntMethod(iJavaDisplayObject,getDisplayWidthID);
-TInt y = iJni->CallIntMethod(iJavaDisplayObject,getDisplayHeightID);
-		LOG2(EJavaMMAPI,EInfo,"CMMADisplay.cpp : SourceSizeChanged () fullScreenSize is x = %d ,y = %d ",x,y);
-		// get the ScreenSize from canvas in java
-TSize canvasSize(x, y);
-fullScreenSize = canvasSize;
-TBool sourceIsBigger = (aSourceSize.iWidth > fullScreenSize.iWidth ||
-aSourceSize.iHeight > fullScreenSize.iHeight);
-if (sourceIsBigger)
-{
-// Source is larger than display area.
-// Shrink draw are to fit in display.
-iWindow->SetDrawRect(ScaleToFullScreen(fullScreenSize, iSourceSize));
-}
-else
-{
-// source is smaller than display area
-iWindow->SetDrawRect(TRect(iUserRect.iTl, iSourceSize));
-}
-SetClippingRegion();
-if (iUserRect.IsEmpty())
-{
-// Java side hasn't set size.
-iUserRect = iWindow->DrawRect();
-if (!sourceIsBigger)
-{
-// Addjusting rect to top left corner.
-iUserRect = TRect(iUserRect.Size());
-}
-}
-}
-void CMMADisplay::SetDisplayPosition(TInt uiControlLocationX,TInt uiControlLocationY,TInt	videoControlLocationX,TInt videoControlLocationY)
-{
-	 	LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged + ");
-		TPoint point(videoControlLocationX ,videoControlLocationY);
-		//calling derived class fuction
-	 	SetDisplayLocationL(point);
-	  LOG(EJavaMMAPI,EInfo,"CMMADisplay::SourceSizeChanged - ");
 }
 void CMMADisplay::ResetJavaRectObject(const TRect& aRect)
-	{
+{
-	LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject +");
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject +");
-	JNIEnv* validJni = iEventSource->getValidJniEnv();
+JNIEnv* validJni = iEventSource->getValidJniEnv();
 jmethodID setRectID = validJni->GetMethodID(
-	                                         iJavaDisplayClass,
+iJavaDisplayClass,
-	                                         "setRect",
+"setRect",
 "()V");
 LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject --1");
 // set the value to java,so that we can access those from array
 jfieldID field = validJni->GetFieldID(iJavaDisplayClass, "rectDimension", "[I");
-if(field == NULL)
+if (field == NULL)
 {
-	  // handle error
+// handle error
 }
 /* Write to the instance fields */
 jintArray javaDimensionarr = (jintArray)validJni->GetObjectField(iJavaDisplayObject, field);
 LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject --2");
 jint* nativeRectDimensionArr = validJni->GetIntArrayElements(javaDimensionarr, NULL);
 LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject --3");
 if (!nativeRectDimensionArr)
-{    // inputBuffer was already allocated
+{
+// inputBuffer was already allocated
 validJni->ReleaseIntArrayElements(javaDimensionarr, nativeRectDimensionArr, JNI_ABORT);
 LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject Error in resetting rect dimension to java");
 return;
 }
 nativeRectDimensionArr[0] = aRect.iTl.iX;
 nativeRectDimensionArr[1] = aRect.iTl.iY;;
 nativeRectDimensionArr[2] = aRect.Width();
 nativeRectDimensionArr[3] = aRect.Height();
 // Now the dimension array in java is updated hence reset the java rect
 validJni->CallVoidMethod(iJavaDisplayObject,setRectID);
 validJni->ReleaseIntArrayElements(javaDimensionarr, nativeRectDimensionArr, JNI_COMMIT);
 LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::ResetJavaRectObject -");
 }
 void CMMADisplay::SetContentBoundToJavaControl(const TRect& aRect)
-	{
+{
-		LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::SetContentBoundToJavaControl +");
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::SetContentBoundToJavaControl +");
-		JNIEnv* validJni = iEventSource->getValidJniEnv();
+JNIEnv* validJni = iEventSource->getValidJniEnv();
-		// Reset the java rect
+// Reset the java rect
-		ResetJavaRectObject(aRect);
+ResetJavaRectObject(aRect);
-		jmethodID setContentBoundID = validJni->GetMethodID(
+jmethodID setContentBoundID = validJni->GetMethodID(
-	                                         iJavaDisplayClass,
+iJavaDisplayClass,
-	                                         "setContentBound",
+"setContentBound",
+"()V");
+// call java function
+validJni->CallVoidMethod(iJavaDisplayObject,setContentBoundID);
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::SetContentBoundToJavaControl -");
+}
+void CMMADisplay::RemoveContentBoundFromJavaControl(const TRect& aRect)
+{
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RemoveContentBoundFromJavaControl +");
+JNIEnv* validJni = iEventSource->getValidJniEnv();
+// Reset the java rect
+ResetJavaRectObject(aRect);
+jmethodID removeContentBoundID = validJni->GetMethodID(
+iJavaDisplayClass,
+"removeContentBound",
 "()V");
 // call java function
-		validJni->CallVoidMethod(iJavaDisplayObject,setContentBoundID);
+validJni->CallVoidMethod(iJavaDisplayObject,removeContentBoundID);
-		LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::SetContentBoundToJavaControl -");
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RemoveContentBoundFromJavaControl -");
-	}
+}
-void CMMADisplay::RemoveContentBoundFromJavaControl(const TRect& aRect)
+void CMMADisplay::RefreshJavaControl()
-	{
+{
-		LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RemoveContentBoundFromJavaControl +");
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RefreshJavaControl +");
-		JNIEnv* validJni = iEventSource->getValidJniEnv();
+JNIEnv* validJni = iEventSource->getValidJniEnv();
-		// Reset the java rect
+// Reset the java rect
-		ResetJavaRectObject(aRect);
+//ResetJavaRectObject(aRect);
-		jmethodID removeContentBoundID = validJni->GetMethodID(
+jmethodID redrawControlID = validJni->GetMethodID(
-	                                         iJavaDisplayClass,
+iJavaDisplayClass,
-	                                         "removeContentBound",
+"redrawControl",
 "()V");
 // call java function
-		validJni->CallVoidMethod(iJavaDisplayObject,removeContentBoundID);
+validJni->CallVoidMethod(iJavaDisplayObject,redrawControlID);
-		LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RemoveContentBoundFromJavaControl -");
+LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RefreshJavaControl -");
-	}
+}
-void CMMADisplay::RefreshJavaControl(const TRect& aRect)
-	{
-		LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RefreshJavaControl +");
-		JNIEnv* validJni = iEventSource->getValidJniEnv();
-		// Reset the java rect
-		//ResetJavaRectObject(aRect);
-		jmethodID redrawControlID = validJni->GetMethodID(
-	                                         iJavaDisplayClass,
-	                                         "redrawControl",
-"()V");
-// call java function
-		validJni->CallVoidMethod(iJavaDisplayObject,redrawControlID);
-		LOG(EJavaMMAPI,EInfo,"MMA::CMMACanvasDisplay::RefreshJavaControl -");
-	}
 //  END OF FILE

changeset 26	dc7c549001d5
parent 23	98ccebc37403
child 47	f40128debb5d
child 56	abc41079b313