diff -r 9ac0a0a7da70 -r 71c436fe3ce0 javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcomposite.cpp --- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcomposite.cpp Tue May 25 12:34:19 2010 +0300 +++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcomposite.cpp Wed Jun 09 09:34:07 2010 +0300 @@ -451,9 +451,17 @@ // Unfocus MSwtControl* ctrl = GetShell().FocusControl(); - if (ctrl && ctrl != iPhysicsFocusedCtrl) + if (ctrl) { - ctrl->CoeControl().SetFocus(EFalse); +#ifdef RD_JAVA_S60_RELEASE_9_2 + // While panning there should be no focus highlight + // Highlight is enabled after pressing any key + ctrl->EnableFocusHighlight(EFalse); +#endif //RD_JAVA_S60_RELEASE_9_2 + if (ctrl != iPhysicsFocusedCtrl) + { + ctrl->CoeControl().SetFocus(EFalse); + } } // Revert @@ -528,6 +536,7 @@ // CSwtTable::CountComponentControls(), etc. CAknControl::HandlePointerEventL(aPointerEvent); } + PostMouseEventL(aPointerEvent); } void CSwtComposite::HandleScrollEventL(CEikScrollBar* aScrollBar, TEikScrollEvent aEventType) @@ -936,6 +945,37 @@ } } +void CSwtComposite::SetBounds(const TRect& aRect) +{ + // Divert the job to UiUtils if this is a parent to an editor + // open for split view editing. + MSwtUiUtils& utils = iDisplay.UiUtils(); + if (utils.SplitInputView() == this) + { + utils.SetSplitInputViewSize(aRect.Size()); + SetLocation(aRect.iTl); + } + else + { + ASwtScrollableBase::SetBounds(aRect); + } +} + +void CSwtComposite::SetWidgetSize(const TSize& aSize) +{ + // Divert the job to UiUtils if this is a parent to an editor + // open for split view editing. + MSwtUiUtils& utils = iDisplay.UiUtils(); + if (utils.SplitInputView() == this) + { + utils.SetSplitInputViewSize(aSize); + } + else + { + ASwtScrollableBase::SetWidgetSize(aSize); + } +} + void CSwtComposite::DrawScrollBarBackground(const TRect& aRect) const { const CCoeControl& coeControl = CoeControl();