MCL/sf/app/jrt: comparison javauis/lcdui_akn/lcdui/src/CMIDCanvas.cpp

equal deleted inserted replaced

-:4376525cdefb
+:e5618cc85d74
 #include <javastoragenames.h>
 #include <javauid.h>
 #include <javasymbianoslayer.h>
 #ifdef RD_JAVA_S60_RELEASE_9_2
 // Used with partial VKB
-#include <aknpriv.hrh>
+#include <AknPriv.hrh>
 #endif // RD_JAVA_S60_RELEASE_9_2
 #include "javaoslayer.h"
 // Using constants for S60 LCDUI Plugin internal keys.
 TSize size = iViewRect.Size();
 TInt sizePacked = (size.iWidth << 16) | (size.iHeight);
 PostEvent(EPaint, posPacked, sizePacked);
 }
+// If is added first direct content, then NGA is switched off
+// and move of iViewRect is needed.
+if (iFullScreen && iScalingOn && iDirectContents.Count() == 1)
+{
+iViewRect.Move(-iPositionRelativeToScreen);
+}
 #endif // RD_JAVA_NGA_ENABLED
 }
 // ---------------------------------------------------------------------------
 {
 iDirectContents.Remove(index);
 if (iDirectContents.Count() == 0)
 {
 iRestoreContentWhenUnfaded = EFalse;
+#ifdef RD_JAVA_NGA_ENABLED
+// If is removed last direct content, then NGA is switched on
+// and move of iViewRect is needed.
+if (iScalingOn && iFullScreen)
+{
+iViewRect.Move(iPositionRelativeToScreen);
+}
+#endif // RD_JAVA_NGA_ENABLED
 }
 }
 }
 CMIDDisplayable* CMIDCanvas::GetDisplayable() const
 {
 return iDisplayable;
 }
 #endif // RD_JAVA_S60_RELEASE_9_2
 // ---------------------------------------------------------------------------
 // CMIDCanvas::SetComponentIndexL
 // Changes the index of the specified custom component.
 // (other items are commented in the header file)
 // ---------------------------------------------------------------------------
 }
 if (!IsEglAvailable())
 {
 // No M3G content, use pixel source
-ActivatePixelSourceL();
+ActivatePixelSourceL(EFalse);
 DEBUG("CMIDCanvas::Draw - Pixel Source activated");
 }
 else // M3G content, use EGL surface
 {
 // Invalidates window so that wserv does not
 // ---------------------------------------------------------------------------
 //
 void CMIDCanvas::HandleResourceChange(TInt aType)
 {
 #ifdef RD_JAVA_S60_RELEASE_9_2
-if ((aType == KEikInputLanguageChange) |
+if ((aType == KAknSplitInputEnabled) |
-(aType == KAknSplitInputEnabled) |
 (aType == KAknSplitInputDisabled))
+{
+// We need inform CanvasItems that partial virtual keyboard
+// is open or closed. This is needed only when partial VKB changes
+// its state.
+TBool partialVKBOpen = (aType == KAknSplitInputEnabled);
+if (partialVKBOpen != iPartialVKBOpen)
+{
+iPartialVKBOpen = partialVKBOpen;
+for (int i = 0; i < iCustomComponents.Count(); i++)
+{
+iCustomComponents[i]->HandleResourceChange(aType);
+}
+}
+}
+else if (aType == KEikInputLanguageChange)
 #else
 if (aType == KEikInputLanguageChange)
 #endif // RD_JAVA_S60_RELEASE_9_2
 {
+// We need inform TextEditor that input language is changed.
 if ((iFocusedComponent != KComponentFocusedNone) &&
 (iFocusedComponent < iCustomComponents.Count()))
 {
 iCustomComponents[iFocusedComponent]->
 CustomComponentControl(KComponentMainControl)->
 HandleResourceChange(aType);
 }
-}
-if (aType == KEikDynamicLayoutVariantSwitch)
+}
+else if (aType == KEikDynamicLayoutVariantSwitch)
 {
 // If orientation change is done,
 // then we have to inform all components about it.
 if (iFullScreen && iScalingOn)
 {
 for (int i = 0; i < iCustomComponents.Count(); i++)
 {
-iCustomComponents[i]->HandleResolutionChange();
+iCustomComponents[i]->HandleResourceChange(aType);
 }
 }
 }
 else if ((aType == KEikMessageUnfadeWindows) ||
 (aType == KEikMessageFadeAllWindows))
 //
 // iViewRect.iTl                -> (0, 0)
 // iViewRect.iBr - TSize(1, 1)  -> (iContentSize.iWidth - 1,
 //                                  iContentSize.iHeight - 1)
 point -= iViewRect.iTl;
 #ifdef RD_JAVA_NGA_ENABLED
-if (iFullScreen && iScalingOn)
+// If NGA is started and scaling is on then the drawing rectangle
+// is moved. Them we need move pointer events too.
+if (iFullScreen && iScalingOn && iDirectContents.Count() == 0)
 {
 // Fix coordinates
 point += iPositionRelativeToScreen;
 }
 #endif // RD_JAVA_NGA_ENABLED
 }
 }
 // To have cursor on focused control.
 if ((iFocusedComponent != KComponentFocusedNone) &&
-(iFocusedComponent < iCustomComponents.Count()))
+(iFocusedComponent < iCustomComponents.Count()) &&
+iCustomComponents[iFocusedComponent]->
+CustomComponentControl(KComponentMainControl)->IsVisible())
 {
 iCustomComponents[iFocusedComponent]->
 CustomComponentControl(KComponentMainControl)->
 SetFocus(ETrue);
 }
 #ifdef RD_JAVA_NGA_ENABLED
 // To avoid situation when Canvas is redrawn but black area remains
 if (iAlfCompositionPixelSource)
 {
-TRAPD(err, ActivatePixelSourceL());
+TRAPD(err, ActivatePixelSourceL(EFalse));
 if (err != KErrNone)
 {
 DEBUG_INT("CMIDCanvas::FocusChanged - ActivatePixelSourceL error %d", err);
 }
 }
 {
 iDirectContents[j]->MdcContainerVisibilityChanged(EFalse);
 }
 }
-// To  cursor on focused control.
+// To remove cursor on focused control.
 if ((iFocusedComponent != KComponentFocusedNone) &&
-(iFocusedComponent < iCustomComponents.Count()))
+(iFocusedComponent < iCustomComponents.Count()) &&
+iCustomComponents[iFocusedComponent]->
+CustomComponentControl(KComponentMainControl)->IsVisible())
 {
 iCustomComponents[iFocusedComponent]->
 CustomComponentControl(KComponentMainControl)->
 SetFocus(EFalse);
 }
 {
 iOldContentBounds = contentBounds;
 TSize contentSize;
+#ifdef RD_JAVA_S60_RELEASE_9_2
+if (iFullScreen && (orientedOrgMIDletScrSize != controlSize)
+&& !iPartialVKBOpen)
+#else
 if (iFullScreen && (orientedOrgMIDletScrSize != controlSize))
+#endif // RD_JAVA_S60_RELEASE_9_2
 {
 contentSize = orientedOrgMIDletScrSize;
 }
 if (contentSize == KZeroSize)
 {
 CMIDCanvas* myself = const_cast<CMIDCanvas*>(this);
 myself->ClearUiSurface(ETrue);
 if (iAlfCompositionPixelSource)
 {
-TRAP_IGNORE(myself->ActivatePixelSourceL());
+TRAP_IGNORE(myself->ActivatePixelSourceL(ETrue));
 }
 }
 iWndUpdate = EFalse;
 }
 i3DAccelerated =
 iEnv.IsHardwareAcceleratedL(MMIDEnv::EHardware3D) > 0;
 InitPixelSourceL();
 #endif // RD_JAVA_NGA_ENABLED
+#ifdef RD_JAVA_S60_RELEASE_9_2
+iPartialVKBOpen = EFalse;
+#endif // RD_JAVA_S60_RELEASE_9_2
 }
 // ---------------------------------------------------------------------------
 // CMIDCanvas::SetContainerWindowL
 TSize viewSize;
 if (iFullScreen)
 {
 #ifdef RD_JAVA_NGA_ENABLED
-if (iScalingOn)
+// If both NGA and scaling are on, then iViewRect is needed move
+// for preverifing wrong position of Canvas.
+if (iScalingOn && (!iFullScreen || iDirectContents.Count() == 0))
 {
 // Translate to screen coordinates.
 rect.Move(iPositionRelativeToScreen);
 }
 #endif // RD_JAVA_NGA_ENABLED
 // scaled to that size.
 if (iTargetMIDletScrSize != KZeroSize)
 {
 viewSize = iTargetMIDletScrSize;
 }
+#ifdef RD_JAVA_S60_RELEASE_9_2
+// If partial VKB is open then MIDlet is not scaled.
+// That we need set iViewRect to whole size of Canvas.
+if (iPartialVKBOpen)
+{
+viewSize = Size();
+}
+#endif //RD_JAVA_S60_RELEASE_9_2
 // If optional JAD parameter Nokia-MIDlet-Target-Display-Size is NOT
 // defined and Nokia-MIDlet-Original-Display-Size is defined to
 // smaller size than the device's screen size, we will scale the
 // Canvas to fit the screen without changing aspect ratio.
 // ---------------------------------------------------------------------------
 // CMIDCanvas::ActivatePixelSourceL
 // In scaling case need to call SetExtent() again if pixel source was suspended.
 // ---------------------------------------------------------------------------
 //
-void CMIDCanvas::ActivatePixelSourceL()
+void CMIDCanvas::ActivatePixelSourceL(TBool aDrawingOngoing)
 {
 ASSERT(iAlfCompositionPixelSource);
 if (iDirectContents.Count() > 0)
 {
 User::Leave(err);
 }
 if (iPixelSourceSuspended)
 {
-ClearUiSurface(EFalse);
+ClearUiSurface(aDrawingOngoing);
 iPixelSourceSuspended = EFalse;
 if (iFullScreen && iScalingOn)
 {
 iAlfCompositionPixelSource->SetExtent(iViewRect, KPhoneScreen);
 }

branch	RCL_3
changeset 23	e5618cc85d74
parent 21	4376525cdefb
child 24	6c158198356e