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

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 #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
 TInt CEikScrollBarExtension::ScrollBarType()
 {
 return CEikScrollBar::EArrowHead;
 }
-void CEikScrollBarExtension::CreateButtonL(CAknScrollButton*& /*aButton*/,CAknScrollButton::TType /*aType*/)
-{
-}
 void CEikScrollBarExtension::DoSetModel(const TEikScrollBarModel* aModel)
 {
 iParent->iModel=(*aModel);
 iParent->iModel.CheckBounds();
 {
 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 )
 }
 if (aWindowOwning)
 {
 CreateWindowL(aParent);
-if ( CAknEnv::Static()->TransparencyEnabled() )
+EnableWindowTransparency();
-{
+Window().SetPointerGrab( ETrue );
-Window().SetRequiredDisplayMode( EColor16MA );
+EnableDragEvents();
-if ( Window().SetTransparencyAlphaChannel() == KErrNone )
-{
-Window().SetBackgroundColor( ~0 );
-}
-}
 }
 else if(aParent)
 {
 SetContainerWindowL(*aParent);
 }
 else
 SetObserver(NULL);
 iOrientation=aOrientation;
 CreateRequiredComponentsL();
-if (aWindowOwning)
-{
-Window().SetPointerGrab(ETrue);
-EnableDragEvents();
-if (extension->iScrollIndicator)
-extension->iScrollIndicator->SetAsWindowOwning(ETrue);
-// By default set background to transparent
-SetTransparentBackground(ETrue);
-}
 SetComponentsToInheritVisibility(ETrue);
 MakeVisible(EFalse);
 ActivateL();
 }
 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) )
+if ( aVisible  && (extension->iScrollIndicator->ScrollSpan() > 0)  && !( extension->iExtensionType & ENoExpandedTouchArea ) )
 {
 modifier->Push( *this, ExtensionArea() );
 }
 else
 {
 EXPORT_C void CAknDoubleSpanScrollBar::SizeChanged()
 {
 CAknPointerEventModifier* modifier = iAvkonAppUiBase ? iAvkonAppUiBase->PointerEventModifier() : NULL;
-if ( modifier && IsVisible() )
+if (iExtension)
 {
-modifier->Update( *this, ExtensionArea() );
+CAknDoubleSpanScrollBarExtension* extension = static_cast<CAknDoubleSpanScrollBarExtension*> (iExtension);
+if ( modifier && IsVisible() && !( extension->iExtensionType & ENoExpandedTouchArea ) )
+{
+modifier->Update( *this, ExtensionArea() );
+}
+}
+else
+{
+if ( modifier && IsVisible()  )
+{
+modifier->Update( *this, ExtensionArea() );
+}
 }
 AknsUtils::RegisterControlPosition( this );
 if (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,
-ETouchFeedbackBasicSlider,
-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 )
 {
 indicator->SetBackgroudHighlight( ETrue );
 extension->iPointerDownPosition  = position;
 if(iButtons.iIncreaseNudge &&
 iButtons.iIncreaseNudge->Rect().Contains(aPointerEvent.iPosition))
 {
 extension->iPointerDownOn = CEikScrollBar::EIncreaseNudgeButton;
 }
 {
 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);
 // check the same for the parent
 feedbackEnabled = !parent->IsDimmed() && parent->IsVisible();
 }
 if ( feedback && feedbackEnabled )
 {
-feedback->InstantFeedback( this, ETouchFeedbackBasicSlider, aPointerEvent );
+feedback->InstantFeedback( this, ETouchFeedbackSlider, aPointerEvent );
 }
 }
 // request pointer repeat until the thumb reaches the pen down position
 TInt newThumbPosPix = indicator->GetCurrentThumbPositionInPixels();
 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;
 // check the same for the parent
 feedbackEnabled = !parent->IsDimmed() && parent->IsVisible();
 }
 if ( feedback && feedbackEnabled )
 {
-feedback->InstantFeedback( this, ETouchFeedbackBasicSlider, aPointerEvent );
+feedback->InstantFeedback( this, ETouchFeedbackSlider, aPointerEvent );
 }
 }
 // request pointer repeat until the thumb reaches the pen down position
 TInt newThumbPosPix = indicator->GetCurrentThumbPositionInPixels();
 }
 // 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, ETouchFeedbackBasicSlider, fbType, aPointerEvent );
+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();
 }
 // Show popup info
 if ( extension->iShowPopup && extension->iPopupController )
 {
 TPoint infoPoint = PositionRelativeToScreen();
 if ( iOrientation == EVertical )
 {
 if ( AknLayoutUtils::LayoutMirrored() )
+	{
+								TRect mainPaneRect( 0, 0, 0, 0 );
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
+mainPaneRect );
+TInt mainPaneWidth = mainPaneRect.Width();
+infoPoint.iX += ( mainPaneWidth - infoPoint.iX + Rect().Width() ) / 2 ;
+infoPoint.iY += aPointerEvent.iPosition.iY;
+extension->iPopupController->SetPositionAndAlignment (
+infoPoint, EHRightVCenter );
+}
+else
 {
-infoPoint.iX += Rect().Width();
+infoPoint.iX = infoPoint.iX / 2;
 infoPoint.iY += aPointerEvent.iPosition.iY;
 extension->iPopupController->SetPositionAndAlignment (
 infoPoint, EHLeftVCenter );
 }
-else
-{
-infoPoint.iY += aPointerEvent.iPosition.iY;
-extension->iPopupController->SetPositionAndAlignment (
-infoPoint, EHRightVCenter );
-}
 }
 else if ( iOrientation == EHorizontal )
 {
+//infoPoint.iY = infoPoint.iY / 2;
 infoPoint.iX += aPointerEvent.iPosition.iX;
 extension->iPopupController->SetPositionAndAlignment(
 infoPoint, EHCenterVBottom );
 }
 extension->iPopupController->ShowInfoPopupNote();
 }
 }
 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(
 //       button may be obsolete.
 // Sensitive feedback given for each "nudge"
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
-feedback->InstantFeedback ( this, ETouchFeedbackBasicSlider, aPointerEvent );
+feedback->InstantFeedback ( this, ETouchFeedbackSlider, aPointerEvent );
 }
 extension->SetModelThumbPosition(thumbPosition);
 indicator->SetIndicatorValues(scrollSpan, thumbPosition, thumbSpan, 0, 0);
 if(indicator->DrawBackgroundState())
 indicator->DrawNow();
 //       button may be obsolete.
 // Sensitive feedback given for each "nudge"
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
-feedback->InstantFeedback ( this, ETouchFeedbackBasicSlider, aPointerEvent );
+feedback->InstantFeedback ( this, ETouchFeedbackSlider, aPointerEvent );
 }
 extension->SetModelThumbPosition(thumbPosition);
 indicator->SetIndicatorValues(scrollSpan, thumbPosition, thumbSpan, 0, 0);
 if(indicator->DrawBackgroundState())
 indicator->DrawNow();
 //
 void CAknDoubleSpanScrollBar::ResetPressedDownHighlight()
 {
 CAknDoubleSpanScrollBarExtension* extension =
 static_cast<CAknDoubleSpanScrollBarExtension*>( iExtension );
 CAknDoubleSpanScrollIndicator* indicator = extension->iScrollIndicator;
 indicator->SetHandleHighlight( EFalse );
 }
 //
 TInt CAknDoubleSpanScrollBarExtension::ScrollBarType()
 {
 return CEikScrollBarFrame::EDoubleSpan;
 }
-void CAknDoubleSpanScrollBarExtension::CreateButtonL(CAknScrollButton*& /*aButton*/,CAknScrollButton::TType /*aType*/)
-{
-}
 void CAknDoubleSpanScrollBarExtension::DoSetModel(const TEikScrollBarModel* aModel)
 {
 iParent->iModel=(*aModel);
 if (iScrollIndicator)
 aModel->iThumbSpan,
 0,
 0);
 }
-if (iParent->OwnsWindow() && iScrollIndicator->TransparentBackground())
-{
-iParent->Window().HandleTransparencyUpdate();
-}
 if(iScrollIndicator->IsVisible())
 {
 if(iScrollIndicator->DrawBackgroundState() && !iParent->OwnsWindow())
 {
 if(HasModelChanged(aModel))
 iActiveScheduledDraw->Start(TCallBack(ScheduledDraw,this));
 }
 }
 else
 {
 iParent->DrawDeferred();
 }
 }
 }
 }
 {
 iScrollIndicator = CAknDoubleSpanScrollIndicator::NewL( iParent->iOrientation );
 iScrollIndicator->SetContainerWindowL( *iParent );
 iScrollIndicator->SetRect( iParent->Rect() );
 iScrollIndicator->SetComponentsToInheritVisibility(ETrue);
+iScrollIndicator->SetAsWindowOwning( iParent->OwnsWindow() );
 }
 if ( AknLayoutUtils::PenEnabled() &&
 ( iScrollBarFlags & CEikScrollBar::EEnableNudgeButtons ) )
 {
 {
 // 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
+if ( !AknLayoutUtils::LayoutMirrored() )
+{
+xGap = parentRect.iBr.iX - scrollBarRect.iBr.iX;
+if ( Abs( xGap ) < scrollBarRect.Width() )
+{
+extension.iBr.iX += xGap;
+}
+}
+// right to left layout in use
+else
+{
+xGap = parentRect.iTl.iX - scrollBarRect.iTl.iX;
+if ( Abs( xGap ) < scrollBarRect.Width() )
+{
+extension.iTl.iX += xGap;
+}
+}
+}
+else
+{
+xGap = parentRect.iBr.iY - scrollBarRect.iBr.iY;
+if ( Abs( xGap ) < scrollBarRect.Height() )
+{
+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();
 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.Width();
 }
 return area;
 }

branch	RCL_3
changeset 20	d48ab3b357f1
parent 19	aecbbf00d063
child 21	978afdc0236f