FCL/sf/mw/classicui: comparison uifw/EikStd/dlgsrc/EIKDPAGE.CPP

equal deleted inserted replaced

-:941195f2d488
+:a8834a2e9a96
 const TPointerEvent& aPointerEvent,
 TInt aTouchedLineIndex,
 TInt aCurrentLine )
 {
 CEikCaptionedControl* firstLine( aDPage.LineOnPageOrNull( 0 ) );
-TBool viewMode( !aDPage.IsEditable() );
+if( aDPage.IsEditable() )
-// note, that iFormControl is checked in Feedback()
+{
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
+// note, that iFormControl is checked in Feedback()
-aCurrentLine != aTouchedLineIndex &&
-firstLine )
-{
-// feedback for edit/view mode form, when non-focused line is clicked
-// feedback for focused item is responsibility of the item
-// no feedback with focus change when single click is enabled
-if ( !iUsesSingleClick )
-{
-Feedback( aDPage, ETouchFeedbackSensitiveList );
-}
-iFocusItemChanged = ETrue;
-}
-else if ( viewMode && firstLine )
-{
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
-aTouchedLineIndex == aCurrentLine )
+aCurrentLine != aTouchedLineIndex &&
-{
+firstLine )
-// Feedback for view mode form, when focused item is
+{
-// clicked. Basically same case as for msk simulation later on
+// feedback for edit mode form, when non-focused line is clicked
-// the function, but on pointer
+// feedback for focused item is responsibility of the item
-// down. iExtension->iFocusedClicked is not valid here, since
+// no feedback with focus change when single click is enabled
-// it can't be known in this phase whether user drags pointer
+if ( !iUsesSingleClick )
-// away.
+{
-Feedback( aDPage, ETouchFeedbackList );
+Feedback( aDPage, ETouchFeedbackSensitiveList );
-iFocusItemChanged = EFalse;
+}
-}
+iFocusItemChanged = ETrue;
-else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+}
-{
+else if ( firstLine )
-// When focus changed, it should not send feedback on up event.
+{
-// When up event comes, aTouchedLineIndex always equal to
+if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
-// aCurrentLine.
+aTouchedLineIndex == aCurrentLine )
-if ( !iFocusItemChanged )
+{
-{
+// Feedback for edit mode form, when focused item is
-SilentFeedback( aDPage, ETouchFeedbackList, aPointerEvent );
+// clicked. Basically same case as for msk simulation later on
+// the function, but on pointer
+// down. iExtension->iFocusedClicked is not valid here, since
+// it can't be known in this phase whether user drags pointer
+// away.
+Feedback( aDPage, ETouchFeedbackList );
+iFocusItemChanged = EFalse;
+}
+else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+{
+// When focus changed, it should not send feedback on up event.
+// When up event comes, aTouchedLineIndex always equal to
+// aCurrentLine.
+if ( !iFocusItemChanged )
+{
+SilentFeedback( aDPage, ETouchFeedbackList, aPointerEvent );
+}
 }
 }
 }
 }
 TTouchLogicalFeedback aFeedback ) const
 {
 if ( iFeedback &&
 aDPage.IsForm() &&
 !aDPage.IsDimmed() &&
-aDPage.IsVisible() &&
+aDPage.IsVisible() )
-aDPage.IsEditable() )
 {
 iFeedback->InstantFeedback( aFeedback );
 }
 }
 const TPointerEvent& aPointerEvent ) const
 {
 if ( iFeedback &&
 aDPage.IsForm() &&
 !aDPage.IsDimmed() &&
-aDPage.IsVisible() &&
+aDPage.IsVisible() )
-aDPage.IsEditable() )
 {
 iFeedback->InstantFeedback( &aDPage,
 aFeedback,
 ETouchFeedbackVibra,
 aPointerEvent );
 AknsUtils::RegisterControlPosition(capCtrl->iCaption);
 AknsUtils::RegisterControlPosition(capCtrl->iControl);
 AknsUtils::RegisterControlPosition(capCtrl->iTrailer);
 AknsUtils::RegisterControlPosition(capCtrl->iBitmap);
 if ( capCtrl->iIsFormControl && iCurrentLine != i)
 {
+if (capCtrl->ControlIsAnEdwin(capCtrl->iControlType))
-if (capCtrl->ControlIsAnEdwin(capCtrl->iControlType))
+{
-{
+CEikEdwin *edwin = (CEikEdwin*)capCtrl->iControl;
-CEikEdwin *edwin = (CEikEdwin*)capCtrl->iControl;
+TRAP_IGNORE( edwin->TextView()->SetDocPosL( 0 ) );
-TRAP_IGNORE(edwin->TextView()->SetDocPosL(0)
+}
-);
+}
 }
-}
-}
 _AKNTRACE_FUNC_EXIT;
 }
 void CEikDialogPage::SetActiveAndFocusL()
 {
 CEikCaptionedControl* line=(*iLines)[ii];
 if (line->IsNonFocusing() || line->IsDimmed() || !(line->IsVisible()))
 continue;
 ChangeFocusTo(ii);
 focusSet=ETrue;
-if ( IsForm() )
-{
-// move line with initial focus to the screen
-		iLines->MoveLineToScreen( ii, iPhysics->ViewTopY(), ETrue );
-}
 break;
 }
 iExtension->iSetInitialFocusDone = ETrue;
 _AKNTRACE( "return focusSet;: [%d]", focusSet );
 _AKNTRACE_FUNC_EXIT;
 }
 void CEikDialogPage::SizeChanged()
 {
 	_AKNTRACE_FUNC_ENTER;
+	if ( IsForm() )
+	    {
+iExtension->iInitialLayoutDone = EFalse;
+iScroll->SetOutsideRect( Rect() );
+// force each line to resize
+TInt count = iLines->Count();
+for ( TInt i = 0; i < count; ++i )
+{
+(*iLines)[i]->HandleResourceChange( KEikDynamicLayoutVariantSwitch );
+}
+iLines->SetRect( Rect(), iScroll->Top(), iScroll->Middle(), iScroll->Bottom() );
+iExtension->iInitialLayoutDone = ETrue;
+UpdatePhysics();
+if ( ( count > 0 ) && ( iCurrentLine >= 0 ) )
+{
+ExposeLine( iCurrentLine, ETrue );
+}
+TRAP_IGNORE( UpdateScrollBarL() ); // ignore any errors.
+AknsUtils::RegisterControlPosition( this );
+_AKNTRACE_FUNC_EXIT;
+return;
+	    }
 // update form area's size to scroll control
 iScroll->SetOutsideRect( Rect() );
 iLines->SetRect( Rect(), iScroll->Top(), iScroll->Middle(), iScroll->Bottom() );
 if ( (iLines->Count() > 0 ) && ( iCurrentLine >= 0 ) )
 }
 TRAP_IGNORE( UpdateScrollBarL() ); // ignore any errors.
 AknsUtils::RegisterControlPosition( this );
-UpdatePhysics();
 iExtension->iInitialLayoutDone = ETrue;
 _AKNTRACE_FUNC_EXIT;
 }
 TSize CEikDialogPage::MinimumSize()
 }
 else
 {
 iExtension->iPopFieldEvents = 1;
 }
-ReconsiderPageSize();
+(*iLines)[iCurrentLine]->SetRect( (*iLines)[iCurrentLine]->Rect() );
 ExposeLine( index, ETrue );
 DrawNow();
 UpdateScrollBarL();
 PrepareToDrawVerticalLine();
 if ( (maximumEdwinHeight > 0) && (height > maximumEdwinHeight))
 height=maximumEdwinHeight;  // Can't be bigger than edwin itself
 size.iHeight = height;
 // Must force a size change on current captioned contrl even if control doesn't change size (so that edwin is resized by aknutils)
 aEdwin->SetSize(size);
-ReconsiderPageSize();
-ExposeLine(iCurrentLine, ETrue);
+if ( IsForm() )
+{
+(*iLines)[iCurrentLine]->SetRect( (*iLines)[iCurrentLine]->Rect() );
+ExposeLine( iCurrentLine, ETrue );
+}
+else
+{
+ReconsiderPageSize();
+ExposeLine(iCurrentLine, ETrue);
+}
 PrepareToDrawVerticalLine(); // do flushes here.
 /* improved redraw code
 Due to some unpleasantness about dialogs, forms and requirements, to get caption controls
 to draw properly requires a call to draw now.  A system initiated draw does not work correctly
 ShowFocus(ETrue, EFalse );
 if ( ( oldLine != iCurrentLine && IsForm() ) &&
 iExtension->iInitialLayoutDone )
 {
+// Set temporarily for EFalse to prevent one extra physics update
+// because of two calls to iLines->MoveLineToScreen
+iExtension->iInitialLayoutDone = EFalse;
 if ( oldLine != -1 )
 {
 iLines->MoveLineToScreen( oldLine, 0, EFalse );
 TRAP_IGNORE( RecordLineL( oldLine ) );
 }
+// set back to correct value
+iExtension->iInitialLayoutDone = ETrue;
 		TRAP_IGNORE( RecordLineL( iCurrentLine ) );
 		iLines->MoveLineToScreen( iCurrentLine, iPhysics->ViewTopY(), ETrue );
 		}
 _AKNTRACE_FUNC_EXIT;
 * which are shared across the environment, e.g. colors or fonts.
 */
 void CEikDialogPage::HandleResourceChange(TInt aType)
 {
 	_AKNTRACE_FUNC_ENTER;
-if ( aType==KEikDynamicLayoutVariantSwitch )
+if ( aType==KEikDynamicLayoutVariantSwitch && !IsForm() )
 {
 const TInt numLines=iLines->Count();
 for ( TInt i=0; i < numLines; i++ )
 {
 CEikCaptionedControl* thisLine=(*iLines)[i];
 // Tell each of the controls on the page (which are part of a form) of their editable state.
 _AKNTRACE_FUNC_ENTER;
 _AKNTRACE( "CEikDialogPage::SetEditableL() aEditable: [%d]", aEditable );
 iIsEditable = aEditable;
+TBool initialLayoutDone = iExtension->iInitialLayoutDone;
+iExtension->iInitialLayoutDone = EFalse;
 HighlightVisible( aEditable );
 if ( iExtension->iUsesSingleClick && iExtension->iSetInitialFocusDone )
 {
 ShowFocus( EFalse );
 if ((iLines->Count()>0) && (iCurrentLine >= 0))
 {
 ExposeLine(iCurrentLine,ETrue);
 }
+iExtension->iInitialLayoutDone = initialLayoutDone;
+if ( IsForm() )
+{
+UpdatePhysics();
+}
 _AKNTRACE_FUNC_EXIT;
 }
 TBool CEikDialogPage::AnythingToDisplay() const
 {
 aPointerEvent,
 touchedLine,
 iCurrentLine );
 iExtension->iWasScrolling = ( iPhysics->OngoingPhysicsAction() !=
 CAknPhysics::EAknPhysicsActionNone );
-iPhysics->Stop();
+if(iExtension->iWasScrolling)
+{
+iPhysics->Stop();
+iExtension->Feedback( *this, ETouchFeedbackList );
+}
 iExtension->iLastTouchedLine = touchedLine;
 iExtension->iDragStartPosition = aPointerEvent.iPosition;
 iExtension->iLastPointerPos = aPointerEvent.iPosition;
 iExtension->iStartTime.HomeTime();
 aPointerEvent.iType == TPointerEvent::EButton1Up &&
 touchedLine == iCurrentLine &&
 ( iExtension->iFocusedClicked || iExtension->iUsesSingleClick ) &&
 !iExtension->iScrolling )
 {
-// Not need to sent key event when focus lost.
+		mskPress = ETrue;
-CEikCaptionedControl* currentLine = (*iLines)[iCurrentLine];
-if ( currentLine->IsFocused() )
-	{
-mskPress = ETrue;
-	}
 callDefaultImplementation = EFalse;
 }
 if ( callDefaultImplementation && ( iExtension->iFocusedClicked ||
 iExtension->iUsesSingleClick ) && newLine &&
 !iExtension->iWasScrolling )
 if ( mskPress )
 {
 TKeyEvent key;
 key.iCode=EKeyOK;
-key.iModifiers=0;
+key.iModifiers=EModifierSpecial;
 key.iRepeats = 0;
 iEikonEnv->SimulateKeyEventL( key, EEventKey );
 }
 _AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 //
 void CEikDialogPage::UpdateLineInCache( CEikCaptionedControl* aLine )
 {
 	_AKNTRACE_FUNC_ENTER;
+	if ( !IsActivated() )
+	    {
+_AKNTRACE_FUNC_EXIT;
+return;
+	    }
 TInt lineIndex = iLines->FindLineIndex( aLine );
 if ( lineIndex != KErrNotFound )
 {
 if ( aLine->Position() != TPoint( 1000, 0 ) )
 }
 }
 CCoeControl::HandleResourceChange(aType);
-if(aType==KEikDynamicLayoutVariantSwitch)
+// if this is a form then its size has been set already by
+// CEikDialog::HandleResourceChange
+if ( aType == KEikDynamicLayoutVariantSwitch && !iForm )
 {
 SizeChanged();
 }
 TInt numPages = iPageArray->Count();

branch	RCL_3
changeset 29	a8834a2e9a96
parent 25	941195f2d488
child 50	a1caeb42b3a3