FCL/sf/mw/classicui: comparison uifw/EikStd/coctlsrc/EIKSCRLB.CPP

equal deleted inserted replaced

-:3d340a0166ff
+:941195f2d488
 #include "AknDoubleSpanScrollIndicator.h"
 #include "eikscrlb.h"
 #include "EIKSBEXT.H"
-const TInt KIntensity = 100; // 100%
 const TInt KScrollBarWidth=9;
 // const TInt KScrollButtonHeight=10;
 // const TInt KArrowHeadScrollBarLength=20;
 // Constants for double span scrollbar
 {
 AKNTASHOOK_REMOVE();
 if ( iAvkonAppUiBase )
 {
 CAknPointerEventModifier* modifier = iAvkonAppUiBase->PointerEventModifier();
 if ( modifier )
 {
 modifier->Pop( *this );
 }
 }
 AknsUtils::DeregisterControlPosition( this );
 }
 EXPORT_C void CAknDoubleSpanScrollBar::ConstructL(TBool aWindowOwning, MEikScrollBarObserver* aScrollBarObserver,const CCoeControl* aParent,
 TOrientation aOrientation,TInt /*aLength*/,TInt aScrollBarFlags )
 EXPORT_C void CAknDoubleSpanScrollBar::MakeVisible(TBool aVisible)
 {
 CAknPointerEventModifier* modifier = iAvkonAppUiBase ? iAvkonAppUiBase->PointerEventModifier() : NULL;
 if ( modifier )
 {
 CAknDoubleSpanScrollBarExtension* extension = static_cast<CAknDoubleSpanScrollBarExtension*> (iExtension);
 if ( aVisible  && (extension->iScrollIndicator->ScrollSpan() > 0)  && !( extension->iExtensionType & ENoExpandedTouchArea ) )
 {
 EXPORT_C void CAknDoubleSpanScrollBar::SizeChanged()
 {
 CAknPointerEventModifier* modifier = iAvkonAppUiBase ? iAvkonAppUiBase->PointerEventModifier() : NULL;
 if (iExtension)
 {
 CAknDoubleSpanScrollBarExtension* extension = static_cast<CAknDoubleSpanScrollBarExtension*> (iExtension);
-			if ( modifier && IsVisible() && !( extension->iExtensionType & ENoExpandedTouchArea ) )
+if ( modifier && IsVisible() && !( extension->iExtensionType & ENoExpandedTouchArea ) )
-				{
+{
-				modifier->Update( *this, ExtensionArea() );
+modifier->Update( *this, ExtensionArea() );
-				}
+}
 }
 else
-	{
+{
-		if ( modifier && IsVisible()  )
+if ( modifier && IsVisible()  )
-			{
+{
-			modifier->Update( *this, ExtensionArea() );
+modifier->Update( *this, ExtensionArea() );
-			}
+}
-	}
+}
 AknsUtils::RegisterControlPosition( this );
 if (iExtension)
 {
 CAknDoubleSpanScrollBarExtension* extension = static_cast<CAknDoubleSpanScrollBarExtension*> (iExtension);
 // clear the pointer down info on pen up and hide info popup
 TInt lastPointerDownOn = extension->iPointerDownOn;
 // The real span area available (as pixels)
 scrollSpanPix -= thumbSpanPix;
 // touch release on thumb
 TBool thumbPressed =
 ( position < (thumbPositionPix + thumbSpanPix)
 && position > thumbPositionPix );
 if ( thumbPressed &&
 aPointerEvent.iType == TPointerEvent::EButton1Up &&
 thumbSpan < scrollSpan )
+{
+MTouchFeedback* feedback = MTouchFeedback::Instance();
+CCoeControl* parent = Parent();
+TBool feedbackEnabled = !IsDimmed() && IsVisible();
+if (parent && feedbackEnabled)
 {
-MTouchFeedback* feedback = MTouchFeedback::Instance();
+// check the same for the parent
+feedbackEnabled = !parent->IsDimmed() && parent->IsVisible();
-CCoeControl* parent = Parent();
-TBool feedbackEnabled = !IsDimmed() && IsVisible();
-if (parent && feedbackEnabled)
-{
-// check the same for the parent
-feedbackEnabled = !parent->IsDimmed() && parent->IsVisible();
-}
-if ( feedback && feedbackEnabled )
-{
-feedback->InstantFeedback( this,
-ETouchFeedbackSlider,
-ETouchFeedbackVibra,
-aPointerEvent );
-}
 }
+if ( feedback && feedbackEnabled )
+{
+feedback->InstantFeedback( this,
+ETouchFeedbackSlider,
+ETouchFeedbackVibra,
+aPointerEvent );
+}
+}
+if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+{
+extension->iPointerDownOn = CEikScrollBar::ENone;
+// Highlight off always when the pointer is lifted
+indicator->SetHandleHighlight( EFalse );
+indicator->DrawDeferred();
+indicator->SetBackgroudHighlight( EFalse );
+if ( extension->iPopupController )
+{
+extension->iPopupController->HideInfoPopupNote();
+extension->iShowPopup = EFalse;
+}
+}
 // check that scroll bar is useful
 if (thumbSpan < scrollSpan)
 {
 // check where the pointer down occured
 if(aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 extension->iPointerDownOn = CEikScrollBar::EIncreaseShaft;
 }
 }
-if (aPointerEvent.iType == TPointerEvent::EButton1Up)
-{
-extension->iPointerDownOn = CEikScrollBar::ENone;
-// Highlight off always when the pointer is lifted
-indicator->SetHandleHighlight( EFalse );
-indicator->DrawDeferred();
-indicator->SetBackgroudHighlight( EFalse );
-if ( extension->iPopupController )
-{
-extension->iPopupController->HideInfoPopupNote();
-extension->iShowPopup = EFalse;
-}
-}
 // respond to the pointer event
 switch(extension->iPointerDownOn)
 {
 case CEikScrollBar::EDecreaseShaft:
 case CEikScrollBar::EIncreaseShaft:
 thumbPosition -= thumbSpan;
 thumbPosition = Max(0, thumbPosition);
 TInt prevPosValue = extension->ThumbPosition();
 // This will update the thumb's pixel extent, used
 // below
 extension->SetModelThumbPosition(thumbPosition);
 indicator->SetIndicatorValues(scrollSpan, thumbPosition, thumbSpan, 0, 0);
 ignoreRect.iBr = TPoint(newThumbPosPix, rt.iBr.iY);
 }
 // repeat until thumb reaches the stylus down position
 pointerWindow->RequestPointerRepeatEvent(KScrollRepeatTimeout, ignoreRect);
 }
 }
 else
 {
 event = iOrientation==EHorizontal ? EEikScrollPageRight : EEikScrollPageDown;
 }
 // repeat until thumb reaches the stylus down position
 pointerWindow->RequestPointerRepeatEvent(KScrollRepeatTimeout, ignoreRect);
 }
 }
 if(indicator->DrawBackgroundState())
 indicator->DrawNow();
 else
 {
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
 TTouchFeedbackType fbType = TTouchFeedbackType(
 ETouchFeedbackAudio |
 ETouchFeedbackVibra );
 feedback->InstantFeedback( this, ETouchFeedbackSlider, fbType, aPointerEvent );
 }
 }
 if( aPointerEvent.iType == TPointerEvent::EDrag
 || aPointerEvent.iType == TPointerEvent::EButtonRepeat )
 {
 // performace improving. Too many drag event received, handling every single event
 // will use too much CPU time.
 TTime now;
 now.HomeTime();
 if ( extension->iDragged &&
 now.MicroSecondsFrom( extension->iLastDrag )
 < KScrollDragTimeout )
 {
 break; // ignore drag for this time
 }
 extension->iDragged = ETrue; // after this time, iLastDragged has value.
 extension->iLastDrag = now;
 thumbPositionPix = position - extension->iPointerOffsetFromThumb;
 TInt oldPosition = thumbPosition;
 TReal newPosition = thumbPositionPix * ( scrollSpan - thumbSpan ) / (TReal)scrollSpanPix;
 thumbPosition = newPosition;
 thumbPosition = Max(0, thumbPosition);
 thumbPosition = Min((scrollSpan - thumbSpan), thumbPosition);
 if(thumbPosition != oldPosition)
 {
-// Smooth continuous tactile feedback is produced
-// during thumb dragging. The tactile feedback API
-// filters out possible re-startings of the effect.
-MTouchFeedback* feedback = MTouchFeedback::Instance();
-if ( feedback )
-{
-TTimeIntervalMicroSeconds32 timeout( 300000 );
-feedback->StartFeedback( this,
-ETouchContinuousSlider,
-&aPointerEvent,
-KIntensity, // intensity 100%
-timeout );
-}
 extension->SetModelThumbPosition(thumbPosition);
 indicator->SetIndicatorValues(scrollSpan, thumbPosition, thumbSpan, 0, 0);
 if(indicator->DrawBackgroundState())
 indicator->DrawNow();
 }
 }
 break;
 case CEikScrollBar::ENone:
-{
-// Stop the continuous tactile feedback that may be playing
-// at the time due to possible previous thumb dragging.
-MTouchFeedback* feedback = MTouchFeedback::Instance();
-if ( feedback )
-{
-feedback->StopFeedback( this );
-}
-}
 if(lastPointerDownOn == CEikScrollBar::EThumb)
 {
 if(extension->ScrollBarObserver())
 {
 extension->ScrollBarObserver()->HandleScrollEventL(
 //
 void CAknDoubleSpanScrollBar::ResetPressedDownHighlight()
 {
 CAknDoubleSpanScrollBarExtension* extension =
 static_cast<CAknDoubleSpanScrollBarExtension*>( iExtension );
 CAknDoubleSpanScrollIndicator* indicator = extension->iScrollIndicator;
 indicator->SetHandleHighlight( EFalse );
 }
 //
 iActiveScheduledDraw->Start(TCallBack(ScheduledDraw,this));
 }
 }
 else
 {
 iParent->DrawDeferred();
 }
 }
 }
 }
 {
 // Usage of hard-coded parent rectangle is acceptable since we're
 // interested in only about the ratio between scrollbar and extension.
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( TRect( 0, 0, 200, 200 ), AknLayoutScalable_Avkon::listscroll_gen_pane( 0 ).LayoutLine() );
 TRect parent( layoutRect.Rect() ); // parent of both extension and scrollbar
 layoutRect.LayoutRect( parent, AknLayoutScalable_Avkon::scroll_pane( 0 ).LayoutLine() );
 TRect scrollbar( layoutRect.Rect() );
 CAknDoubleSpanScrollBarExtension* extension1 = static_cast<CAknDoubleSpanScrollBarExtension*> (iExtension);
 if( extension1->iExtensionType & ENormalExpandedTouchArea )
 layoutRect.LayoutRect( parent, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar( 0 ).LayoutLine() );
 else if( extension1->iExtensionType & EScaleExpandedTouchArea )
 layoutRect.LayoutRect( parent, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar_cale( 0 ).LayoutLine() );
 else
 layoutRect.LayoutRect( parent, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar( 0 ).LayoutLine() );
 TRect extension( layoutRect.Rect() );
 TRect area;
 if ( iParentControl )
 {
 CCoeControl* windowOwningParent = iParentControl;
 while ( windowOwningParent && !windowOwningParent->OwnsWindow() )
 {
 windowOwningParent = windowOwningParent->Parent();
 }
 if ( windowOwningParent )
 {
 TInt xGap = 0;
 TRect scrollBarRect = Rect();
 TRect parentRect = windowOwningParent->Rect();
 if ( OwnsWindow() )
 {
 scrollBarRect.Move( Position().iX -
 windowOwningParent->Position().iX, 0 );
 }
 if ( iOrientation == CEikScrollBar::EVertical )
-	{
+{
-				// left to right layout in use
+// left to right layout in use
-				if ( !AknLayoutUtils::LayoutMirrored() )
+if ( !AknLayoutUtils::LayoutMirrored() )
-					{
+{
-					xGap = parentRect.iBr.iX - scrollBarRect.iBr.iX;
+xGap = parentRect.iBr.iX - scrollBarRect.iBr.iX;
-					if ( Abs( xGap ) < scrollBarRect.Width() )
+if ( Abs( xGap ) < scrollBarRect.Width() )
-						{
+{
-						extension.iBr.iX += xGap;
+extension.iBr.iX += xGap;
-						}
+}
-					}
+}
-				// right to left layout in use
+// right to left layout in use
-				else
+else
-					{
+{
-					xGap = parentRect.iTl.iX - scrollBarRect.iTl.iX;
+xGap = parentRect.iTl.iX - scrollBarRect.iTl.iX;
-					if ( Abs( xGap ) < scrollBarRect.Width() )
+if ( Abs( xGap ) < scrollBarRect.Width() )
-						{
+{
-						extension.iTl.iX += xGap;
+extension.iTl.iX += xGap;
-						}
+}
-					}
+}
-	}
+}
 else
-	{
+{
-				xGap = parentRect.iBr.iY - scrollBarRect.iBr.iY;
+xGap = parentRect.iBr.iY - scrollBarRect.iBr.iY;
-				if ( Abs( xGap ) < scrollBarRect.Height() )
+if ( Abs( xGap ) < scrollBarRect.Height() )
-					{
+{
-					extension.iBr.iY += xGap;
+extension.iBr.iY += xGap;
-					}
+}
-	}
+}
 }
 }
 if ( iOrientation == CEikScrollBar::EVertical )
 {
 area.iTl.iX = extension.iTl.iX - scrollbar.iTl.iX;
 area.iTl.iY = scrollbar.iTl.iY - extension.iTl.iY;
 area.iBr.iX = area.iTl.iX + extension.Width();
 else
 {
 area.iTl.iX = scrollbar.iTl.iY - extension.iTl.iY;
 area.iTl.iY = scrollbar.Width() - extension.Width();
 area.iBr.iX = iSize.iWidth + ( extension.Height() - scrollbar.Height() );
-area.iBr.iY = area.iTl.iY + extension.Height();
+area.iBr.iY = area.iTl.iY + extension.Width();
 }
 return area;
 }

branch	RCL_3
changeset 25	941195f2d488
parent 23	3d340a0166ff
child 38	c52421ed5f07