FCL/sf/mw/classicui: comparison uifw/AvKon/src/AknPreviewPopUp.cpp

equal deleted inserted replaced

-:2f259fa3e83a
+:3320e4e6e8bb
 #include <apgwgnam.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <AknTasHook.h> // for testability hooks
 #include <touchfeedback.h>
-#include <gfxtranseffect/gfxtranseffect.h>
-#include <akntransitionutils.h>
 const TInt KWindowPosition = 1000;             // window's position
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::NewL
 // -----------------------------------------------------------------------------
 //
+#if defined( RD_SCALABLE_UI_V2 ) || defined( RD_PREVIEW_POPUP )
 CAknPreviewPopUp* CAknPreviewPopUp::NewL( CCoeControl& aContent,
 CAknPreviewPopUpController& aController,
 const TInt aStyle )
 {
 CAknPreviewPopUp* self = new ( ELeave ) CAknPreviewPopUp( aContent,
 : iContent( aContent ),
 iController( aController ),
 iFlags( aStyle ),
 iAllowUpEvent(EFalse)
 {
-GfxTransEffect::Register( this, KGfxPreviewPopupControlUid );
 }
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::~CAknPreviewPopUp
 // -----------------------------------------------------------------------------
 //
 CAknPreviewPopUp::~CAknPreviewPopUp()
 {
 AKNTASHOOK_REMOVE();
-GfxTransEffect::Deregister( this );
 if ( CapturesPointer() )
 {
 SetPointerCapture( EFalse );
 }
 TRect nullRect( 0,0,0,0 );
 iBgContext = CAknsFrameBackgroundControlContext::NewL(
 iFrameId, nullRect, nullRect, EFalse );
-CreateWindowL();
-EnableWindowTransparency();
-TInt stackPriority = ECoeStackPriorityCba;
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
+CreateWindowL();
+// try to enable window transparency
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
+Window().SetRequiredDisplayMode( EColor16MA );
+if ( Window().SetTransparencyAlphaChannel() == KErrNone )
+{
+Window().SetBackgroundColor( ~0 );
+}
+}
+iAvkonAppUi->AddToStackL( this, ECoeStackPriorityCba,
+ECoeStackFlagRefusesAllKeys |
+ECoeStackFlagRefusesFocus );
 Window().SetPointerGrab( ETrue );
 SetGloballyCapturing( ETrue );
+//fix for TSW error PTPA-7HNA25
 Window().SetOrdinalPosition(KWindowPosition);
 }
 else
 {
-stackPriority = ECoeStackPriorityDefault;
+CreateWindowL();
+// try to enable window transparency
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
+Window().SetRequiredDisplayMode( EColor16MA );
+if ( Window().SetTransparencyAlphaChannel() == KErrNone )
+{
+Window().SetBackgroundColor( ~0 );
+}
+}
+iAvkonAppUi->AddToStackL( this, ECoeStackPriorityDefault,
+ECoeStackFlagRefusesAllKeys |
+ECoeStackFlagRefusesFocus );
 Window().SetOrdinalPosition( 0, ECoeWinPriorityNormal );
 }
-iAvkonAppUi->AddToStackL( this, stackPriority,
-ECoeStackFlagRefusesAllKeys |
-ECoeStackFlagRefusesFocus );
 EnableDragEvents();
 SetComponentsToInheritVisibility( ETrue );
 iContent.SetBackground( this );
 iContent.SetContainerWindowL( *this );
 iContent.ActivateL();
 layoutRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::popup_preview_fixed_window().LayoutLine() );
 SetRect( layoutRect.Rect() );
 }
+DrawableWindow()->EnableBackup( EWindowBackupAreaBehind );
 MakeVisible( EFalse );
 ActivateL();
 }
 // -----------------------------------------------------------------------------
 //
 void CAknPreviewPopUp::Show()
 {
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
+//fix for TSW error PTPA-7HNA25
 Window().SetOrdinalPosition( 0 );
 iAvkonAppUi->UpdateStackedControlFlags( this, NULL,
 ECoeStackFlagRefusesAllKeys );
-SetPointerCapture( ETrue );
+if ( AknLayoutUtils::PenEnabled() )
+{
+SetPointerCapture( ETrue );
+}
 }
 iCloseMenu = EFalse;
-TBool useTfx = !( iFlags & CAknPreviewPopUpController::EPermanentMode
+Window().Invalidate();
-|| iFlags & CAknPreviewPopUpController::EFixedMode );
+MakeVisible( ETrue );
-if ( useTfx && GfxTransEffect::IsRegistered( this ) )
-{
-GfxTransEffect::Begin( this, KGfxControlAppearAction );
-MakeVisible( ETrue );
-GfxTransEffect::SetDemarcation( this, iPosition );
-GfxTransEffect::End( this );
-}
-else
-{
-MakeVisible( ETrue );
-}
 if( GrabbingComponent() )
 {
 iCloseMenu = ETrue;
 }
 iController.NotifyObservers( MAknPreviewPopUpObserver::EPreviewPopUpShown );
 !( iFlags & CAknPreviewPopUpController::EPermanentMode ) ) )
 {
 return;
 }
-TBool useTfx = !( iFlags & CAknPreviewPopUpController::EPermanentMode
-|| iFlags & CAknPreviewPopUpController::EFixedMode );
-if ( useTfx && GfxTransEffect::IsRegistered( this ) )
-{
-GfxTransEffect::Begin( this, KGfxControlDisappearAction );
-MakeVisible( EFalse );
-GfxTransEffect::End( this );
-}
-else
-{
-MakeVisible( EFalse );
-}
 Window().ClearRedrawStore();
+MakeVisible( EFalse );
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
+//fix for TSW error PTPA-7HNA25
 Window().SetOrdinalPosition( KWindowPosition );
 iAvkonAppUi->UpdateStackedControlFlags( this,
 ECoeStackFlagRefusesAllKeys,
 ECoeStackFlagRefusesAllKeys );
 }
 AknsDrawUtils::Background( skin, cc, this, aGc, aRect );
 }
 }
+// -----------------------------------------------------------------------------
+// CAknPreviewPopUp::MakeVisible
+// -----------------------------------------------------------------------------
+//
+void CAknPreviewPopUp::MakeVisible( TBool aVisible )
+{
+if ( aVisible != IsVisible() )
+{
+CCoeControl::MakeVisible( aVisible );
+}
+}
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::CountComponentControls
 // -----------------------------------------------------------------------------
 //
 iCloseMenu = EFalse;
 if ( aPointerEvent.iType == TPointerEvent::EButton1Up && !IsVisible() )
 {
 SetPointerCapture( EFalse );
 }
+CAknTouchPane* touchPane = iAvkonAppUi->TouchPane();
 // redirect pointer event to content
 if ( Rect().Contains( aPointerEvent.iPosition ) && IsVisible() )
 {
 iAllowUpEvent = ETrue;
 CCoeControl::HandlePointerEventL( aPointerEvent );
 	  iController.ResetTimer();
 }
 }
 else
 {
+if ( touchPane )
+{
+if ( touchPane->IsVisible() )
+{
+// touchpane is a window-owning control -> Rect() cannot be used
+TRect touchPaneRect( touchPane->Position(), touchPane->Size() );
+if ( touchPaneRect.Contains( aPointerEvent.iParentPosition ) )
+{
+TPointerEvent pointerEvent( aPointerEvent );
+// make event's coordinates touch pane relative
+pointerEvent.iPosition = aPointerEvent.iParentPosition -
+touchPaneRect.iTl;
+static_cast<CCoeControl*>( touchPane )->HandlePointerEventL(
+pointerEvent );
+}
+}
+}
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) &&
 aPointerEvent.iType != TPointerEvent::EDrag &&
 aPointerEvent.iType != TPointerEvent::EButtonRepeat )
 {
 // CAknPreviewPopUp::Draw
 // -----------------------------------------------------------------------------
 //
 void CAknPreviewPopUp::Draw( const TRect& aRect ) const
 {
-CWindowGc& gc = SystemGc();
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
-TRegionFix<4> region;
-region.AddRect( Rect() );
+CWindowGc& gc = SystemGc();
-region.SubRect( iContent.Rect() );
-gc.SetClippingRegion( region );
+TRegionFix< 4 > region;
+region.AddRect( Rect() );
-DrawBackground( gc, aRect );
+region.SubRect( iContent.Rect() );
+gc.SetClippingRegion( region );
-gc.CancelClippingRegion();
+DrawBackground( gc, aRect );
+gc.CancelClippingRegion();
+}
+else
+{
+CWindowGc& gc = SystemGc();
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+if ( !AknsDrawUtils::Background( skin, iBgContext, gc, aRect ) )
+{
+gc.Clear( aRect );
+}
+if ( HasHeading() )
+{
+gc.SetClippingRect( aRect );
+// heading graphics
+TAknLayoutRect layoutRect;
+layoutRect.LayoutRect( Rect(),
+TAknWindowComponentLayout::Compose(
+AknLayoutScalable_Avkon::heading_preview_pane(),
+AknLayoutScalable_Avkon::bg_popup_heading_pane_cp2( 1 ) ).LayoutLine() );
+TRect outerRect( layoutRect.Rect() );
+layoutRect.LayoutRect( outerRect,
+AknLayoutScalable_Avkon::bg_popup_heading_pane_g1() );
+// There's no error checking since if skinned drawing fails heading
+// text will be drawn on top of the background.
+AknsDrawUtils::DrawFrame( skin, gc, outerRect, layoutRect.Rect(),
+KAknsIIDQsnFrPopupHeading, KAknsIIDDefault );
+// heading text
+TAknLayoutText textLayout;
+textLayout.LayoutText( Rect(),
+TAknWindowComponentLayout::ComposeText(
+AknLayoutScalable_Avkon::heading_preview_pane(),
+AknLayoutScalable_Avkon::heading_preview_pane_t1( 1 ) ).LayoutLine() );
+gc.SetBrushStyle( CGraphicsContext::ENullBrush );
+TRgb color( textLayout.Color() );
+if ( iFlags & CAknPreviewPopUpController::ELayoutSubMenu )
+{
+AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG55 );
+}
+else
+{
+AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG19 );
+}
+textLayout.DrawText( gc, *iHeadingText, ETrue, color );
+gc.CancelClippingRect();
+}
+}
 }
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::CenterLayout
 // -----------------------------------------------------------------------------
 aGc.CancelClippingRect();
 }
 }
+#endif // RD_SCALABLE_UI_V2 || RD_PREVIEW_POPUP
 //  End of File

changeset 14	3320e4e6e8bb
parent 0	2f259fa3e83a