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

equal deleted inserted replaced

-:aabf2c525e0f
+:9f56a4e1b8ab
 #include "AknLayoutUtilsHelpers.h"
 #include "AknAdaptiveSearch.h"
 #include <PtiEngine.h>
-#include <akntrace.h>
+#include "akntrace.h"
 #ifdef RD_HINDI_PHONETIC_INPUT
 #include <ptiindicdefs.h>
 #endif
 const TInt KAknStringBufferSize = 256;
 const TInt KTextColorNone = -1;
 const TInt KFontHeightComparisonDivisor = 20;
 const TInt KInvalidIndex = -1;
+// Default for list separator line color's alpha value, used if not
+// found from skin.
+const TInt KDefaultSeparatorAlpha = 32;
 enum TAknLayoutEdwinPanic
 {
 EAknLayoutEdwinPanicNoEdwin,
 EAknLayoutEdwinPanicNoLinesOverMaxNoLines,
 EXPORT_C TBool AknLayoutUtils::LayoutMetricsRect( TAknLayoutMetrics aParam,
 TRect& aRect )
 {
 TAknWindowComponentLayout line;
 TAknLayoutRect rect;
-TRect screenRect(0, 0, AKN_LAYOUT_WINDOW_screen.iW, AKN_LAYOUT_WINDOW_screen.iH);
+rect.LayoutRect( TRect( 0, 0, 0, 0 ), AknLayoutScalable_Avkon::Screen() );
-aRect.SetRect( 0, 0, 0, 0 );
+TRect screenRect( rect.Rect() );
 // No stacon pane active etc. cheking is done here before the switch-case so that we can
 // have slightly better performance for some other lookups (e.g. screen).
-switch (aParam)
+switch ( aParam )
 {
 case EScreen:
+{
 aRect = screenRect;
 return ETrue;
+}
 case EApplicationWindow:
-rect.LayoutRect(
+{
-screenRect,
+// Application window is always the same as screen, so skip
-AknLayoutScalable_Avkon::application_window( 0 ) );
+// reading the application_window from layout data for
-aRect = rect.Rect();
+// performance improvement.
+aRect = screenRect;
 return ETrue;
+}
 case EStatusPane:
 {
 CEikStatusPaneBase* statusPane = CEikStatusPaneBase::Current();
 if ( statusPane )
 {
 TInt currentStatusPaneLayoutResId = statusPane->CurrentLayoutResId();
-if ( AknStatuspaneUtils::StaconPaneActive() )
+TAknWindowComponentLayout parent;
+switch ( currentStatusPaneLayoutResId )
 {
-// flat status pane in landscape mode is the whole top pane area
+case R_AVKON_STATUS_PANE_LAYOUT_USUAL_WITH_BATTERY_PANE:
-if ( currentStatusPaneLayoutResId == R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT ||
+case R_AVKON_STATUS_PANE_LAYOUT_USUAL:
-currentStatusPaneLayoutResId == R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT )
+case R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE:
+case R_AVKON_STATUS_PANE_LAYOUT_USUAL_MIRRORED:
+case R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE_MIRRORED:
+case R_AVKON_STATUS_PANE_LAYOUT_VT:
+case R_AVKON_STATUS_PANE_LAYOUT_VT_MIRRORED:
+case R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT:
+default:
 {
-rect.LayoutRect( screenRect, AknLayoutScalable_Avkon::area_top_pane(8) ); // flat area_top_pane in lsc
+parent = AknLayoutScalable_Avkon::area_top_pane( 0 );
+line = AknLayoutScalable_Avkon::status_pane( 0 );
+break;
+}
+case R_AVKON_STATUS_PANE_LAYOUT_IDLE:
+case R_AVKON_STATUS_PANE_LAYOUT_IDLE_MIRRORED:
+{
+parent = AknLayoutScalable_Avkon::area_top_pane( 7 );
+line = AknLayoutScalable_Avkon::status_idle_pane(); // idle status pane
+break;
+}
+case R_AVKON_STATUS_PANE_LAYOUT_SMALL:
+case R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE:
+case R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE_MIRRORED:
+{
+// Small status pane is the whole top area.
+parent = AknLayoutScalable_Avkon::application_window( 0 );
+if ( Layout_Meta_Data::IsLandscapeOrientation() &&
+AknLayoutUtils::CbaLocation() == AknLayoutUtils::EAknCbaLocationBottom )
+{
+line = AknLayoutScalable_Avkon::area_top_pane( 2 );
+}
+else
+{
+line = AknLayoutScalable_Avkon::area_top_pane( 1 );
+}
+break;
+}
+case R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT:
+case R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT: // fallthrough
+{
+if ( Layout_Meta_Data::IsLandscapeOrientation() )
+{
+parent = AknLayoutScalable_Avkon::area_top_pane( 2 );
+}
+else
+{
+parent = AknLayoutScalable_Avkon::area_top_pane( 6 );
+}
+line   = AknLayoutScalable_Avkon::status_pane( 1 ); // flat status pane
+break;
+}
+case R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL:
+case R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE: // fallthrough
+{
+parent = AknLayoutScalable_Avkon::area_top_pane( 8 );
+line   = AknLayoutScalable_Avkon::status_pane( 1 );
+break;
+}
+case R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT:
+case R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT: // fallthrough
+{
+parent = AknLayoutScalable_Avkon::area_top_pane( 2 );
+line   = AknLayoutScalable_Avkon::status_pane( 1 );
+break;
+}
+case R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS:
+case R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS: // fallthrough
+{
+parent = AknLayoutScalable_Avkon::area_top_pane( 20 );
+line   = AknLayoutScalable_Avkon::status_pane( 5 );
+break;
+}
+case R_AVKON_STACON_PANE_LAYOUT_USUAL_SOFTKEYS_RIGHT:
+case R_AVKON_STACON_PANE_LAYOUT_USUAL_SOFTKEYS_LEFT:
+case R_AVKON_STACON_PANE_LAYOUT_EMPTY_SOFTKEYS_RIGHT:
+case R_AVKON_STACON_PANE_LAYOUT_EMPTY_SOFTKEYS_LEFT:
+case R_AVKON_STACON_PANE_LAYOUT_IDLE_SOFTKEYS_RIGHT:
+case R_AVKON_STACON_PANE_LAYOUT_IDLE_SOFTKEYS_LEFT:
+{
+rect.LayoutRect(
+screenRect,
+TAknWindowComponentLayout::Compose(
+AknLayoutScalable_Avkon::area_top_pane( 2 ),
+AknLayoutScalable_Avkon::stacon_top_pane() ) );
 aRect = rect.Rect();
+rect.LayoutRect(
+aRect,
+AknLayoutScalable_Avkon::control_top_pane_stacon( 0 ) );
+// Status pane top = stacon top - control pane top.
+aRect.iBr.iX = rect.Rect().iTl.iX;
 return ETrue;
-}
-else
-{
-rect.LayoutRect( screenRect, AknLayoutScalable_Avkon::area_top_pane(2) ); // classic area_top_pane in lsc
-aRect = rect.Rect();
-rect.LayoutRect( aRect, AknLayoutScalable_Avkon::stacon_top_pane() );
-aRect = rect.Rect();
-rect.LayoutRect( aRect, AknLayoutScalable_Avkon::control_top_pane_stacon(0) );
-aRect.iBr.iX = rect.Rect().iTl.iX;  // Status pane top = stacon top - control pane top.
-return ETrue;
 }
 }
-else
-{
+rect.LayoutRect(
-TAknWindowComponentLayout parent;
+screenRect,
+TAknWindowComponentLayout::Compose( parent, line ) );
-switch ( currentStatusPaneLayoutResId )
+aRect = rect.Rect();
-{
-case R_AVKON_STATUS_PANE_LAYOUT_USUAL_WITH_BATTERY_PANE:
-case R_AVKON_STATUS_PANE_LAYOUT_USUAL:
-case R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE:
-case R_AVKON_STATUS_PANE_LAYOUT_USUAL_MIRRORED:
-case R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE_MIRRORED:
-case R_AVKON_STATUS_PANE_LAYOUT_VT:
-case R_AVKON_STATUS_PANE_LAYOUT_VT_MIRRORED:
-case R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT:
-default:
-parent = AknLayoutScalable_Avkon::area_top_pane(0);
-line = AknLayoutScalable_Avkon::status_pane(0); // classic status pane
-break;
-case R_AVKON_STATUS_PANE_LAYOUT_IDLE:
-case R_AVKON_STATUS_PANE_LAYOUT_IDLE_MIRRORED:
-parent = AknLayoutScalable_Avkon::area_top_pane(7);
-line = AknLayoutScalable_Avkon::status_idle_pane(); // idle status pane
-break;
-case R_AVKON_STATUS_PANE_LAYOUT_SMALL:
-case R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE:
-case R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE_MIRRORED:
-// Small status pane is the whole top area.
-parent = AknLayoutScalable_Avkon::application_window(0);
-if ( Layout_Meta_Data::IsLandscapeOrientation() &&
-AknLayoutUtils::CbaLocation() == AknLayoutUtils::EAknCbaLocationBottom )
-{
-line = AknLayoutScalable_Avkon::area_top_pane(2);
-}
-else
-{
-line = AknLayoutScalable_Avkon::area_top_pane(1);
-}
-break;
-case R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT:
-case R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT: // fallthrough
-{
-if ( Layout_Meta_Data::IsLandscapeOrientation() &&
-Layout_Meta_Data::IsPenEnabled() )
-{
-parent = AknLayoutScalable_Avkon::area_top_pane( 2 );
-}
-else
-{
-parent = AknLayoutScalable_Avkon::area_top_pane( 6 );
-}
-line   = AknLayoutScalable_Avkon::status_pane( 1 ); // flat status pane
-break;
-}
-case R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL:
-case R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE: // fallthrough
-{
-parent = AknLayoutScalable_Avkon::area_top_pane( 8 );
-line   = AknLayoutScalable_Avkon::status_pane( 1 );
-break;
-}
-case R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT:
-case R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT: // fallthrough
-{
-parent = AknLayoutScalable_Avkon::area_top_pane( 2 );
-line   = AknLayoutScalable_Avkon::status_pane( 1 );
-break;
-}
-case R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS:
-case R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS: // fallthrough
-{
-parent = AknLayoutScalable_Avkon::area_top_pane( 20 );
-line   = AknLayoutScalable_Avkon::status_pane( 5 );
-break;
-}
-}
-rect.LayoutRect( screenRect, TAknWindowComponentLayout::Compose( parent, line ) );
-aRect = rect.Rect();
-}
 return ETrue;
 }
-return EFalse;
-}
+return EFalse; // no status pane
+}
 case EPopupParent:
 {
 if ( screenRect.iBr.iX == 640 && screenRect.iBr.iY == 360 )
 {
 TInt variety = 16;
 else
 {
 return LayoutMetricsRect( EMainPane, aRect );
 }
 }
 case EMainPane:
 {
 TInt variety = 3; // classic main pane variety by default
 TInt currentStatusPaneLayoutResId = AknStatuspaneUtils::CurrentStatusPaneLayoutResId();
 case R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE_MIRRORED:
 case R_AVKON_STATUS_PANE_LAYOUT_VT:
 case R_AVKON_STATUS_PANE_LAYOUT_VT_MIRRORED:
 case R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT:
 {
-// main pane variety for usual portrait main pane with
+// Main pane variety for usual portrait main pane with
-// 'area_top_pane' and 'area_bottom_pane'
+// 'area_top_pane' and 'area_bottom_pane'.
-#ifdef RD_SCALABLE_UI_V2
+variety = 3;
-variety = 3;
-if ( iAvkonAppUi && iAvkonAppUi->TouchPane() && iAvkonAppUi->TouchPane()->IsVisible() )
+if ( iAvkonAppUi )
 {
-variety = 15;
+CAknToolbar* toolbar = iAvkonAppUi->CurrentFixedToolbar();
-}
+if ( toolbar )
-else if ( iAvkonAppUi && iAvkonAppUi->CurrentFixedToolbar() )
+{
-{
+TInt flags = toolbar->ToolbarFlags();
-if ( AknLayoutUtils::PenEnabled() )
+if ( flags & KAknToolbarFixed &&
-{
+!( flags & KAknToolbarDefault ) &&
-CAknToolbar* toolbar = iAvkonAppUi->CurrentFixedToolbar();
+toolbar->IsShown() )
-TInt flags = toolbar->ToolbarFlags();
-if ( flags & KAknToolbarFixed && !( flags & KAknToolbarDefault )
-&& toolbar->IsShown() )
 {
 variety = 18;
 }
 }
 }
-#else
-variety = 3;
-#endif // RD_SCALABLE_UI_V2
 }
 break;
 case R_AVKON_STATUS_PANE_LAYOUT_IDLE:
 case R_AVKON_STATUS_PANE_LAYOUT_IDLE_MIRRORED:
 case R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE:
 case R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE_MIRRORED:
 {
 if ( Layout_Meta_Data::IsLandscapeOrientation() )
 {
-if ( PenEnabled() )
+// main pane variety with small status pane in landscape
-{
+// mode with 'area_top_pane', 'area_bottom_pane' and
-// main pane variety with small status pane in landscape
+// touch pane
-// mode with 'area_top_pane', 'area_bottom_pane' and
+variety = 4;
-// touch pane
-variety = 4;
-}
-else
-{
-// main pane variety with 'area_top_pane' and
-// 'area_bottom_pane' in landscape (without touch pane)
-variety = 9;
-}
 }
 else
 {
 // main pane variety with small status pane in portrait mode
 // (with 'area_top_pane' and 'area_bottom_pane').
 variety = 6;
 }
+break;
 }
-break;
 case R_AVKON_STATUS_PANE_EMPTY:
 case R_AVKON_STATUS_PANE_LAYOUT_EMPTY:
 if ( AknStatuspaneUtils::HDLayoutActive() )
 {
 default:
 break;
 }
-rect.LayoutRect( screenRect, TAknWindowComponentLayout::Compose(
+// Application window is always the same as screen, so use screen
-AknLayoutScalable_Avkon::application_window( 0 ),
+// as parent and skip reading the application_window from layout
-AknLayoutScalable_Avkon::main_pane( variety ) ) );
+// data for performance improvement.
+rect.LayoutRect( screenRect,
+AknLayoutScalable_Avkon::main_pane( variety ) );
 aRect = rect.Rect();
 return ETrue;
 }
 y >>= 1;
 }
 else
 {
 // On portrait popup is located on top of the control pane if it doesn't
-// have softkeys visible.
+// have softkeys visible and there's enough room i.e. the popup still
+// fits to the screen.
 if ( !aSoftkeysVisible )
 {
 TSize controlPane;
 AknLayoutUtils::LayoutMetricsSize( AknLayoutUtils::EControlPane,
 controlPane );
 y -= controlPane.iHeight;
+if ( y < 0 )
+{
+y = 0;
+}
 }
 }
 return TPoint( x, y );
 }
 return Position( aSize, softkeys );
 }
 // -----------------------------------------------------------------------------
-// AknListUtils::DrawSeparator
+// Draws the separator line between list items.
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void AknListUtils::DrawSeparator( CGraphicsContext& aGc,
-const TRect& aRect, const TRgb& aColor )
+const TRect& aRect,
+const TRgb& aColor,
+MAknsSkinInstance* aSkin )
 {
 aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
 aGc.SetPenStyle( CGraphicsContext::ESolidPen );
 TRgb color( aColor );
-color.SetAlpha( 32 );
+// Get the alpha value from skin.
+TRgb colorFromSkin;
+TInt err = AknsUtils::GetCachedColor( aSkin ? aSkin : AknsUtils::SkinInstance(),
+colorFromSkin,
+KAknsIIDQsnLineColors,
+EAknsCIQsnLineColorsCG15 );
+color.SetAlpha( !err ? colorFromSkin.Red() : KDefaultSeparatorAlpha );
 aGc.SetPenColor( color );
 TRect lineRect( aRect );
 TInt gap = AknLayoutScalable_Avkon::listscroll_gen_pane( 0 ).LayoutLine().it;
 lineRect.Shrink( gap, 0 );
 lineRect.Move( 0, -1 );
 aGc.DrawLine( TPoint( lineRect.iTl.iX, lineRect.iBr.iY ),
 TPoint( lineRect.iBr.iX, lineRect.iBr.iY ) );
 }
 // End of file

branch	RCL_3
changeset 10	9f56a4e1b8ab
parent 4	8ca85d2f0db7
child 15	08e69e956a8c