MCL/sf/app/jrt: comparison javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtshell.cpp

equal deleted inserted replaced

-:9ac0a0a7da70
+:71c436fe3ce0
 // Main pane varieties
 static const TInt KSwtMainPainVarietyClassic = 3;
 static const TInt KSwtMainPainVarietySmallSpLandscape = 9;
 static const TInt KSwtMainPainVarietySmallSpLandscapePen = 4;
-// Area bottom pane varieties
-static const TInt KSwtAreaBottomPaneVarietyPortrait = 0;
 #ifdef RD_JAVA_S60_RELEASE_9_2
-static const TInt KSwtAreaBottomPaneVarietyLandscape = 2;
 static const TInt KSwtRoundCornerBgColorDiff = 50;
 #endif // RD_JAVA_S60_RELEASE_9_2
 // ======== MEMBER FUNCTIONS ========
 #ifdef RD_SCALABLE_UI_V2
 window.SetPointerGrab(ETrue);
 #endif //RD_SCALABLE_UI_V2
-CCoeControl::SetRect(DefaultBounds());
+DoSetRect(DefaultBounds());
 SetMinimumSize(TSize());
 UiUtils().RegisterShellL(*this);
 #ifdef RD_SCALABLE_UI_V2
 if ((iStyle & KSwtStyleSystemModal) != 0 ||
 ASSERT(!iFocusControl);
 }
 // ---------------------------------------------------------------------------
+// CSwtShell::DoSetRect
+// Note that calling SetRect on the Shell does not cause a PositionChanged!
+// ---------------------------------------------------------------------------
+//
+void CSwtShell::DoSetRect(const TRect& aRect)
+{
+// Divert the job to UiUtils if this is the Shell of an editor open for
+// split view editing.
+MSwtUiUtils& utils = iDisplay.UiUtils();
+MSwtControl* splitInputView = utils.SplitInputView();
+if (splitInputView && (&(splitInputView->GetShell())) == this)
+{
+utils.SetSplitInputShellPos(aRect.iTl);
+CCoeControl::SetSize(aRect.Size());
+}
+else
+{
+CCoeControl::SetRect(aRect);
+}
+}
+// ---------------------------------------------------------------------------
 // CSwtShell::SwtHandleResourceChangeL
 // From CSwtComposite
 // ---------------------------------------------------------------------------
 //
 void CSwtShell::SwtHandleResourceChangeL(TInt aType)
 static_cast<CAknsBasicBackgroundControlContext*>(GetControlContext());
 if (bg)
 {
 bg->SetRect(iDisplay.Device().Bounds());
 }
-CCoeControl::SetRect(DefaultBounds());
+DoSetRect(DefaultBounds());
 }
 }
 CSwtDecorations::SwtHandleResourceChangeL(aType);
 }
 && capturingControl->IsFocusable())
 {
 capturingControl->SetSwtFocus(KSwtFocusByPointer);
 }
 capturingControl->HandlePointerEventL(aPointerEvent);
-capturingControl->PostMouseEventL(aPointerEvent);
 iDisplay.TryDetectLongTapL(aPointerEvent);
 return;
 }
-MSwtControl* ctrl = NULL;
-if (aPointerEvent.iType == TPointerEvent::EButton1Up)
-ctrl = iDisplay.UiUtils().GetPointerGrabbingControl();
 if (!iDisplay.RevertPointerEvent())
 {
 CSwtComposite::HandlePointerEventL(aPointerEvent);
 }
-if (aPointerEvent.iType != TPointerEvent::EButton1Up)
-ctrl = iDisplay.UiUtils().GetPointerGrabbingControl();
-if (ctrl)
-ctrl->PostMouseEventL(aPointerEvent);
 iDisplay.TryDetectLongTapL(aPointerEvent);
 }
 #else
 void CSwtShell::HandlePointerEventL(const TPointerEvent& /*aPointerEvent*/)
 FinishRedraw();
 }
 }
 }
+void CSwtShell::SizeChanged()
+{
+CSwtDecorations::SizeChanged();
+MSwtUiUtils& utils = iDisplay.UiUtils();
+MSwtControl* splitInputView = utils.SplitInputView();
+if (splitInputView && (&(splitInputView->GetShell())) == this)
+{
+utils.AdjustSplitInputShellPos();
+}
+}
 // ---------------------------------------------------------------------------
 // CSwtShell::Draw
 // From MCoeControlBackground
 // ---------------------------------------------------------------------------
 //
 // Shells never get the CoeControl focus, just active
 return EFalse;
 }
 // ---------------------------------------------------------------------------
-// CSwtShell::DoSetFocus
+// CSwtShell::SetSwtFocus
 // From MSwtControl
 // ---------------------------------------------------------------------------
 //
 TBool CSwtShell::SetSwtFocus(TInt aReason /*=KSwtFocusByApi*/)
 {
 if (iIsMaximized || !iParent)
 {
 return;
 }
-TPoint originalLocation(GetLocation());
+DoSetLocation(aPoint);
-iPosition = aPoint;
-Window().SetPosition(aPoint);
-// Post the MoveEvent if the location changed.
-if (GetLocation() != originalLocation)
-{
-PositionChanged();
-}
-// Drawing after everything else.
-if (!(iStyle & KSwtStyleNoRedrawResize))
-{
-Redraw();
-}
 }
 // ---------------------------------------------------------------------------
 // CSwtShell::SetWidgetSize
 // From MSwtControl
 return;
 }
 TSize checkedSize(Max(aSize.iWidth, iMinSize.iWidth),
 Max(aSize.iHeight, iMinSize.iHeight));
-SetSize(checkedSize);
+if (Size() != checkedSize)
-// Drawing only after everything else.
+{
-if (!(iStyle & KSwtStyleNoRedrawResize))
+SetSize(checkedSize);
-{
-Redraw();
+// Drawing only after everything else.
+if (!(iStyle & KSwtStyleNoRedrawResize))
+{
+Redraw();
+}
 }
 }
 // ---------------------------------------------------------------------------
 // CSwtShell::SetBounds
 if (iIsMaximized || !iParent)
 {
 return;
 }
+TBool changed = EFalse;
 TSize checkedSize(Max(aRect.Size().iWidth, iMinSize.iWidth),
 Max(aRect.Size().iHeight, iMinSize.iHeight));
-SetSize(checkedSize);
+if (Size() != checkedSize)
+{
-TPoint originalLocation(GetLocation());
+SetSize(checkedSize);
-iPosition = aRect.iTl;
+changed = ETrue;
-Window().SetPosition(aRect.iTl);
+}
-if (GetLocation() != originalLocation)
-{
+// Divert the job to UiUtils if this is the Shell of an editor open for
-PositionChanged();
+// split view editing.
-}
+MSwtUiUtils& utils = iDisplay.UiUtils();
+MSwtControl* splitInputView = utils.SplitInputView();
-// No need to recurse on the children, their positions within the
+if (splitInputView && (&(splitInputView->GetShell())) == this)
-// window do not change
+{
+utils.SetSplitInputShellPos(aRect.iTl);
-if (!(iStyle & KSwtStyleNoRedrawResize))
+}
+else
+{
+if (aRect.iTl != iPosition)
+{
+iPosition = aRect.iTl;
+Window().SetPosition(aRect.iTl);
+PositionChanged();
+changed = ETrue;
+}
+// No need to recurse on the children, their positions within the
+// window do not change
+}
+if (changed && !(iStyle & KSwtStyleNoRedrawResize))
 {
 Redraw();
 }
 }
 }
 TRect newRect(TRect::EUninitialized);
 if (aMaximized)
 {
-// Set bounds so as to cover the whole application area
+TRect screenRect;
-RRegion clientRegion;
+AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EScreen, screenRect);
-clientRegion.AddRect(iEikonEnv->EikAppUi()->ClientRect());
+TInt variety(0);
-if (!IsMobileShell())
+if (CSwtLafFacade::IsLandscapeOrientation())
 {
-TInt variety(KSwtAreaBottomPaneVarietyPortrait);
+variety = AknLayoutUtils::PenEnabled() ?
-#ifdef RD_JAVA_S60_RELEASE_9_2
+KSwtMainPainVarietySmallSpLandscapePen :
-if (CSwtLafFacade::IsLandscapeOrientation())
+KSwtMainPainVarietySmallSpLandscape;
-{
+}
-variety = KSwtAreaBottomPaneVarietyLandscape;
+else
-}
+{
-#endif // RD_JAVA_S60_RELEASE_9_2
+variety = KSwtMainPainVarietyClassic;
+}
-clientRegion.SubRect(CSwtLafFacade::GetLayoutRect(
+TAknLayoutRect layoutRect = CSwtLafFacade::GetComposeAndLayoutRect(
-CSwtLafFacade::EAreaBottomPane,
+CSwtLafFacade::EMainPaneCompose, screenRect, variety);
-iDisplay.Device().Bounds(),
+newRect = layoutRect.Rect();
-variety).Rect());
-}
-newRect = clientRegion.BoundingRect();
-clientRegion.Close();
 iNormalBounds.SetRect(iPosition, iSize);
 }
 else
 {
 newRect = iNormalBounds;
 }
-SetPosition(newRect.iTl);
+SetBounds(newRect);
-SetSize(newRect.Size());
 iIsMaximized = aMaximized;
 Redraw();
 }
 void CSwtShell::SetMinimized(TBool aMinimized)
 if (utils.GetActiveShell() == this)
 {
 TRAP_IGNORE(utils.UpdateStatusPaneL());
 }
-CCoeControl::SetRect(DefaultBounds());
+DoSetRect(DefaultBounds());
 SetRedraw(ETrue);
 }
 // ---------------------------------------------------------------------------
 {
 return iIsTaskTip;
 }
 // ---------------------------------------------------------------------------
+// CSwtShell::DoSetLocation
+// From MSwtShell
+// ---------------------------------------------------------------------------
+//
+void CSwtShell::DoSetLocation(const TPoint& aPoint)
+{
+if (aPoint == iPosition)
+{
+return;
+}
+// Divert the job to UiUtils if this is the Shell of an editor open for
+// split view editing.
+MSwtUiUtils& utils = iDisplay.UiUtils();
+MSwtControl* splitInputView = utils.SplitInputView();
+if (splitInputView && (&(splitInputView->GetShell())) == this)
+{
+utils.SetSplitInputShellPos(aPoint);
+return;
+}
+iPosition = aPoint;
+Window().SetPosition(aPoint);
+// Post the MoveEvent if the location changed.
+PositionChanged();
+// Drawing after everything else.
+if (!(iStyle & KSwtStyleNoRedrawResize))
+{
+Redraw();
+}
+}
+// ---------------------------------------------------------------------------
 // CSwtShell::HandleStatusPaneSizeChange
 // From MEikStatusPaneObserver
 // ---------------------------------------------------------------------------
 //
 void CSwtShell::HandleStatusPaneSizeChange()
 {
 if (iIsMaximized  && (!iParent))
 {
-CCoeControl::SetRect(DefaultBounds());
+DoSetRect(DefaultBounds());
 }
 }
 void CSwtShell::FinishRedraw() const
 {

branch	RCL_3
changeset 19	71c436fe3ce0
parent 17	0fd27995241b
child 21	4376525cdefb