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

equal deleted inserted replaced

-:2f259fa3e83a
+:3320e4e6e8bb
 _LIT( KSlashOfPageIndicator, "/" );
 _LIT( KSpaceCharacter, " " );
 const TInt KCloseAndClearButtonCount = 2;
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::NewL()
 // Two-phased constructor.
 // Update layout variant. This should be done when
 // KEikDynamicLayoutVariantSwitch message recieved.
 // -----------------------------------------------------------------------------
 //
 void CAknAdaptiveSearchGrid::UpdateLayoutVariant()
-	{
+{
 _AKNTRACE_FUNC_ENTER;
-	InitGrid();
+InitGrid();
-	UpdatePageAndRowCount();
+UpdatePageAndRowCount();
-	if( IsShown() )
+if( IsShown() )
-		{
+{
-		ControlsPositions();
+ControlsPositions();
-		TRAP_IGNORE( UpdateVisibleButtonsL() );
+TRAP_IGNORE( UpdateVisibleButtonsL() );
-		ShowControls();
+ShowControls();
-		}
+}
 _AKNTRACE_FUNC_EXIT;
-	}
+}
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::UpdateSkinL()
 // Update adaptive search grid skin. This should be done when
 // KAknsMessageSkinChange message recieved.
 // -----------------------------------------------------------------------------
 //
 void CAknAdaptiveSearchGrid::UpdateSkinL()
-	{
+{
 CGulIcon* gulIcon = NULL;
 gulIcon = GetColorIconL( 0 );
 iCloseButton->State()->SetIcon( gulIcon );
 CGulIcon* gulIcon1 = NULL;
 gulIcon1 = GetColorIconL( 1 );
 iDeleteButton->State()->SetIcon( gulIcon1 );
 CGulIcon* gulIcon2 = NULL;
 gulIcon2 = GetColorIconL( 2 );
-	iPrevButton->State()->SetIcon( gulIcon2 );
+iPrevButton->State()->SetIcon( gulIcon2 );
 CGulIcon* gulIcon3 = NULL;
 gulIcon3 = GetColorIconL( 3 );
 iNextButton->State()->SetIcon( gulIcon3 );
-	UpdateVisibleButtonsL();
+UpdateVisibleButtonsL();
 if( iNumOfPages > 1 )
-		{
+{
-		// Page pane & page indicator
+// Page pane & page indicator
-	TRect page_pane = RectFromLayout( Rect(), AknLayoutScalable_Apps::afind_page_pane( iLayoutOption) );
+TRect page_pane = RectFromLayout( Rect(), AknLayoutScalable_Apps::afind_page_pane( iLayoutOption) );
-	if( AknsUtils::AvkonSkinEnabled() )
+if( AknsUtils::AvkonSkinEnabled() )
-	        {
+{
-	        TRgb textColor = KRgbBlack;
+TRgb textColor = KRgbBlack;
-	    TInt error = AknsUtils::GetCachedColor( AknsUtils::SkinInstance(),
+TInt error = AknsUtils::GetCachedColor( AknsUtils::SkinInstance(),
-	                                            textColor,
+textColor,
-	                                            KAknsIIDQsnTextColors,
+KAknsIIDQsnTextColors,
-	                                            EAknsCIQsnTextColorsCG19);
+EAknsCIQsnTextColorsCG19);
-	    if( !error )
+if( !error )
-	        AknLayoutUtils::OverrideControlColorL(*iPageIndicator, EColorLabelText, textColor);
+AknLayoutUtils::OverrideControlColorL(*iPageIndicator, EColorLabelText, textColor);
-		    }
+}
-		iBgContextOfControlPane->SetRect( page_pane );
+iBgContextOfControlPane->SetRect( page_pane );
-		}
+}
-	}
+}
 // CAknAdaptiveSearchGrid::InitGridButtons()
 // Initiates buttons array of the adaptive search grid.
 // iTotalGridButtons should be calculated in advance by caling InitGrid()
 // -----------------------------------------------------------------------------
 //
 {
 TInt layout_option;
 if( Layout_Meta_Data::IsLandscapeOrientation() )
 {
+CAknToolbar* toolbar = iAppUi->CurrentFixedToolbar();
 iLayoutOption = KLandscapeSinglePage;
 layout_option = KLandscapeMaxSize;
-iToolbarShown = EFalse;
+if ( toolbar && toolbar->IsShown() )
+iToolbarShown = ETrue;
+else
+iToolbarShown = EFalse;
 }
 else
 {
 CAknToolbar* toolbar = iAppUi->CurrentFixedToolbar();
 iLayoutOption = KPortraitSinglePage;
 currentWindowRect.iBr.iY = controlPaneRect.iTl.iY;
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
 mainPaneRect );
+CAknToolbar* toolbar = iAppUi->CurrentFixedToolbar();
-if ( 0 != iFindpaneRect.Size().iWidth
+if ( !toolbar
-&& iFindpaneRect.Size().iWidth <= mainPaneRect.Size().iWidth )
+|| !toolbar->IsVisible()
-{
+|| mainPaneRect.iBr.iX <= toolbar->Position().iX
-currentWindowRect.iBr.iX = currentWindowRect.iTl.iX
+)
-+ iFindpaneRect.Size().iWidth;
+{
-}
+currentWindowRect.iBr.iX = mainPaneRect.iBr.iX;
-else
-{
-currentWindowRect.iBr.iX = currentWindowRect.iTl.iX
-+ mainPaneRect.Size().iWidth;
 }
 }
 TRect grid_pane = RectFromLayout( currentWindowRect, AknLayoutScalable_Apps::grid_afind_pane( iLayoutOption ) );
 TRect button_rect = RectFromLayout( grid_pane, AknLayoutScalable_Apps::cell_afind_pane( iLayoutOption, 0, 0 ) );
 find_pane = RectFromLayout( Rect(), AknLayoutScalable_Avkon::popup_find_window() );
 }
 else
 {
 find_pane = RectFromLayout( Rect(), AknLayoutScalable_Apps::find_pane_cp01( iLayoutOption ) );
-	}
+}
 _AKNTRACE( "[%s][%s] rect of find pane is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		find_pane.iTl.iX, find_pane.iTl.iY, find_pane.iBr.iX, find_pane.iBr.iY );
+find_pane.iTl.iX, find_pane.iTl.iY, find_pane.iBr.iX, find_pane.iBr.iY );
 iInputFrame->SetRect( find_pane );
 iSkinContextOfFindPane->SetRect( find_pane );
 // Backspace and close buttons
 cell_pane = RectFromLayout( grid_pane, AknLayoutScalable_Apps::cell_afind_pane(iLayoutOption, iNumOfCols-2, iNumOfRows-1) );
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*iNumOfRows;
 cell_pane.iTl.iY = cell_pane.iTl.iY - iOverlapLength*(iNumOfRows-1);
 }
 _AKNTRACE( "[%s][%s] rect of delete button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iDeleteButton->SetRect( cell_pane );
 cell_pane = RectFromLayout( grid_pane, AknLayoutScalable_Apps::cell_afind_pane(iLayoutOption, iNumOfCols-1, iNumOfRows-1) );
 // For ELJG-7VC8Q2, move close button up
 if(iPopupFindpane && ( iLayoutOption == KPortraitSinglePage ||iLayoutOption == KLandscapeSinglePage))
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*iNumOfRows;
 cell_pane.iTl.iY = cell_pane.iTl.iY - iOverlapLength*(iNumOfRows-1);
 }
 _AKNTRACE( "[%s][%s] rect of close button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iCloseButton->SetRect( cell_pane );
 // For ELJG-7VC8Q2, Move all the buttons up when there is only one page
 if(iPopupFindpane)
 {
 {
 for ( TInt i = 0; i < iNumOfCols; i++ )
 {
 cell_pane = RectFromLayout( grid_pane, AknLayoutScalable_Apps::cell_afind_pane( iLayoutOption, i, j ) );
 if(iLayoutOption == KPortraitSinglePage ||iLayoutOption == KLandscapeSinglePage )
-	    {
+{
 cell_pane.iTl.iY -=iOverlapLength*j;
 cell_pane.iBr.iY -=iOverlapLength*(j+1);
-	    }
+}
 iButtonArray[temp]->SetRect( cell_pane );
 temp++;
 }
 }
-	}
+}
 if ( Layout_Meta_Data::IsLandscapeOrientation() && AknLayoutUtils::LayoutMirrored() )
 {
 SetCornerAndSize( EHLeftVTop, Rect().Size());
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*(iNumOfRows+1);
 }
 _AKNTRACE( "[%s][%s] rect of delete button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iDeleteButton->SetRect( cell_pane );
 cell_pane = RectFromLayout( cont_pane, AknLayoutScalable_Apps::cell_afind_grid_control_pane(0,1) );
 // For ELJG-7VC8Q2, Move close button up
 if(iPopupFindpane)
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*(iNumOfRows+1);
 }
 _AKNTRACE( "[%s][%s] rect of close button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iCloseButton->SetRect( cell_pane );
 }
 // Page pane
 TRect page_pane;
 page_pane = RectFromLayout( Rect(), AknLayoutScalable_Apps::afind_page_pane( iLayoutOption) );
 _AKNTRACE( "[%s][%s] rect of page pane is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		page_pane.iTl.iX, page_pane.iTl.iY, page_pane.iBr.iX, page_pane.iBr.iY );
+page_pane.iTl.iX, page_pane.iTl.iY, page_pane.iBr.iX, page_pane.iBr.iY );
 AknLayoutUtils::LayoutLabel( iPageIndicator, Rect(),
 TAknWindowComponentLayout::ComposeText( AknLayoutScalable_Apps::afind_page_pane( iLayoutOption ),
 AknLayoutScalable_Apps::afind_page_pane_t1() ).LayoutLine() );
 // Next and previous buttons
 if(iPopupFindpane)
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*(iNumOfRows+1);
 }
 _AKNTRACE( "[%s][%s] rect of pre page button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iPrevButton->SetRect( cell_pane );
 cell_pane = RectFromLayout( page_pane, AknLayoutScalable_Apps::afind_page_pane_g3( iLayoutOption) );
 // For ELJG-7VC8Q2, Move next button up
 if(iPopupFindpane)
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*(iNumOfRows+1);
 }
 _AKNTRACE( "[%s][%s] rect of next page button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iNextButton->SetRect( cell_pane );
 }
 else
 {
 cell_pane = RectFromLayout( page_pane, AknLayoutScalable_Apps::afind_page_pane_g2( iLayoutOption) );
 if(iPopupFindpane)
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*(iNumOfRows+1);
 }
 _AKNTRACE( "[%s][%s] rect of next page button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iNextButton->SetRect( cell_pane );
 cell_pane = RectFromLayout( page_pane, AknLayoutScalable_Apps::afind_page_pane_g3( iLayoutOption) );
 // For ELJG-7VC8Q2, Move pre button up
 if(iPopupFindpane)
 {
 cell_pane.iBr.iY = cell_pane.iBr.iY - iOverlapLength*(iNumOfRows+1);
 }
 _AKNTRACE( "[%s][%s] rect of pre page button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
+cell_pane.iTl.iX, cell_pane.iTl.iY, cell_pane.iBr.iX, cell_pane.iBr.iY );
 iPrevButton->SetRect( cell_pane );
 }
 if( AknsUtils::AvkonSkinEnabled() )
 {
 CAknToolbar* toolbar = iAppUi->CurrentFixedToolbar();
 TBool needRelayout = EFalse;
 if( Layout_Meta_Data::IsLandscapeOrientation())
 {
-if ( iLayoutOption == KPortraitMultiPage
+if ( iLayoutOption == KPortraitMultiPage || iLayoutOption == KPortraitSinglePage )
-|| iLayoutOption == KPortraitSinglePage
-|| iFindPaneSizeChanged )
 {
 needRelayout = ETrue;
-iFindPaneSizeChanged = EFalse;
+}
-}
+else if ( toolbar && toolbar->IsVisible() && iToolbarShown == EFalse )
+{
+needRelayout = ETrue;
+}
 }
 else if ( iLayoutOption == KLandscapeMultiPage || iLayoutOption == KLandscapeSinglePage )
 {
 needRelayout = ETrue;
 }
 bState->SetTextL( ptr.Mid(charPosition, 1) );
 }
 }
 button_rect = button->Rect();
 _AKNTRACE( "[%s][%s] rect of button %s is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__, bState->Text().Ptr(),
-		button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
+button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
 iCurrentRegion.AddRect( button_rect );
 button->MakeVisible( ETrue );
 }
 else
 {
 bState->SetTextL( ptr.Mid(CharPosition, 1));
 }
 }
 button_rect = button->Rect();
 _AKNTRACE( "[%s][%s] rect of button %s is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__, bState->Text().Ptr(),
-		button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
+button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
 iCurrentRegion.AddRect( button_rect );
 button->MakeVisible( ETrue );
 }
 }
 }
 bState->SetTextL( ptr.Mid(i, 1) );
 }
 }
 button_rect = button->Rect();
 _AKNTRACE( "[%s][%s] rect of button %s is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__, bState->Text().Ptr(),
-		button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
+button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
 iCurrentRegion.AddRect( button_rect );
 button->MakeVisible( ETrue );
 }
 }
 }
 }
 }
 button_rect = iDeleteButton->Rect();
 _AKNTRACE( "[%s][%s] rect of delete button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
+button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
 iCurrentRegion.AddRect( button_rect );
 button_rect = iCloseButton->Rect();
 _AKNTRACE( "[%s][%s] rect of close button is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
+button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
 iCurrentRegion.AddRect( button_rect );
 button_rect = iInputFrame->Rect();
 _AKNTRACE( "[%s][%s] rect of Input Frame is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
+button_rect.iTl.iX, button_rect.iTl.iY, button_rect.iBr.iX, button_rect.iBr.iY );
 iCurrentRegion.AddRect( button_rect );
 if( iNumOfPages > 1 )
 {
 TRect page_pane;
 page_pane = RectFromLayout( Rect(), AknLayoutScalable_Apps::afind_page_pane(iLayoutOption) );
 _AKNTRACE( "[%s][%s] rect of page pane is %d %d %d %d ", "CAknAdaptiveSearchGrid", __FUNCTION__,
-		page_pane.iTl.iX, page_pane.iTl.iY, page_pane.iBr.iX, page_pane.iBr.iY );
+page_pane.iTl.iX, page_pane.iTl.iY, page_pane.iBr.iX, page_pane.iBr.iY );
 iCurrentRegion.AddRect( page_pane );
 }
 }
 Window().SetShape( iCurrentRegion );
 _AKNTRACE_FUNC_EXIT;
 {
 _AKNTRACE_FUNC_ENTER;
 _AKNTRACE( "[%s][%s] Event Type : %d ", "CAknAdaptiveSearchGrid", __FUNCTION__, aType );
 switch( aType )
 {
-	case KEikDynamicLayoutVariantSwitch:
+case KEikDynamicLayoutVariantSwitch:
-	{
+{
-	UpdateLayoutVariant();
+UpdateLayoutVariant();
-	break;
+break;
-	}
+}
 case KAknsMessageSkinChange:
-	{
+{
-	TRAP_IGNORE( UpdateSkinL() );
+TRAP_IGNORE( UpdateSkinL() );
-	break;
+break;
-	}
+}
 default:
-	{
+{
-	break;
+break;
-	}
+}
 }
 CAknControl::HandleResourceChange( aType );
 _AKNTRACE_FUNC_EXIT;
 }
 MAknAdaptiveSearchGridObserver* CAknAdaptiveSearchGrid::AdaptiveSearchGridObserver()
 {
 return iAdaptiveSearchGridObserver;
 }
-// -----------------------------------------------------------------------------
-// CCAknAdaptiveSearch::SaveFindPaneRect()
-// When the rect of find pane is set, this functions will be notified
-// to record the size of it.
-// -----------------------------------------------------------------------------
-//
-void CAknAdaptiveSearchGrid::SaveFindPaneRect( const TRect &aRect )
-{
-//Now we just deal with the landscape conditions
-if ( !Layout_Meta_Data::IsLandscapeOrientation() )
-return;
-//When width is zero, no need to deal with.
-if ( 0 == aRect.Size().iWidth )
-return;
-//The same size already is set. No need to do further process.
-if ( aRect.Size().iWidth == iFindpaneRect.Size().iWidth )
-return;
-iFindpaneRect = aRect;
-iFindPaneSizeChanged = ETrue;
-}
 // End of File

changeset 14	3320e4e6e8bb
parent 0	2f259fa3e83a