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

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 _LIT( KSlashOfPageIndicator, "/" );
 _LIT( KSpaceCharacter, " " );
 const TInt KCloseAndClearButtonCount = 2;
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::NewL()
 // Two-phased constructor.
 //
 CAknAdaptiveSearchGrid::~CAknAdaptiveSearchGrid()
 {
 _AKNTRACE_FUNC_ENTER;
 CEikonEnv::Static()->EikAppUi()->RemoveFromStack( this );
-if ( iBgContextOfControlPane )
+delete iBgContextOfFindPane;
-	{
+delete iBgContextOfControlPane;
-		delete iBgContextOfControlPane;
+delete iSkinContextOfFindPane;
-		iBgContextOfControlPane = NULL;
+delete iInputFrame;
-	}
 // Clear current region of AS
 iCurrentRegion.Clear();
 iButtonArray.ResetAndDestroy();
+if ( iEditor )
+{
+TRAP_IGNORE(iEditor->TextView()->SetCursorVisibilityL(
+TCursor::EFCursorInvisible, TCursor::EFCursorInvisible ));
+delete iEditor;
+}
 if( iGridChars )
 {
 delete iGridChars;
 iGridChars = NULL;
 }
 {
 delete iPageIndicator;
 iPageIndicator = NULL;
 }
-if ( iAppUi )
+CAknWsEventMonitor* eventMonitor = iAppUi->EventMonitor();
-{
+eventMonitor->Enable( EFalse );
-CAknWsEventMonitor* eventMonitor = iAppUi->EventMonitor();
+eventMonitor->RemoveObserver( this );
-eventMonitor->Enable( EFalse );
-eventMonitor->RemoveObserver( this );
-}
 _AKNTRACE_FUNC_EXIT;
 }
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::ConstructL()
 if ( err == KErrNone )
 {
 Window().SetBackgroundColor(~0);
 }
 }
-Window().SetPointerGrab( ETrue );
 CAknWsEventMonitor* eventMonitor = iAppUi->EventMonitor();
 eventMonitor->AddObserverL( this );
 eventMonitor->Enable();
+iSkinContextOfFindPane = CAknsListBoxBackgroundControlContext::NewL( KAknsIIDQsnBgAreaControlPopup,
+TRect(0,0,0,0),
+EFalse,
+KAknsIIDNone,
+TRect(0,0,0,0) );
+iBgContextOfFindPane = CAknsFrameBackgroundControlContext::NewL( KAknsIIDQsnFrInput,
+TRect(0,0,0,0),
+TRect(0,0,0,0),
+EFalse );
 iBgContextOfControlPane = CAknsBasicBackgroundControlContext::NewL( KAknsIIDQgnGrafAdaptSearchPageBg,
 TRect(0,0,0,0), EFalse );
 // Init components
 InitControlsL( aFieldStyle );
 InitGrid();
 case CAknSearchField::EPopupAdaptiveSearchWindow:
 flags |= CAknInputFrame::EPopupWindowLayout;
 flags |= CAknInputFrame::EFixedFindWithoutLine;
 break;
 }
+iEditor = new (ELeave) CEikEdwin;
+iInputFrame = CAknInputFrame::NewL( iEditor,
+EFalse,
+KAvkonBitmapFile,
+EMbmAvkonQgn_indi_find_glass,
+EMbmAvkonQgn_indi_find_glass_mask,
+flags );
+iEditor->SetContainerWindowL( *this );
+iInputFrame->SetContainerWindowL( *this );
+AknEditUtils::ConstructEditingL( iEditor,
+iTextLimit,
+1,
+EAknEditorCharactersLowerCase,
+EAknEditorAlignLeft,
+EFalse,
+ETrue,
+EFalse );
+iEditor->SetObserver( this );
+iEditor->SetBorder( TGulBorder::ENone );
+iEditor->SetAknEditorInputMode( EAknEditorTextInputMode );
+iEditor->SetAknEditorAllowedInputModes( EAknEditorTextInputMode |
+EAknEditorNumericInputMode );
+iEditor->AddFlagToUserFlags( CEikEdwin::EAvkonDisableVKB );
+if ( FeatureManager::FeatureSupported( KFeatureIdJapanese ) )
+{
+iEditor->SetAknEditorPermittedCaseModes( EAknEditorCharactersLowerCase );
+}
+TInt editorFlags = EAknEditorFlagNoT9 |
+EAknEditorFlagNoLRNavigation |
+EAknEditorFlagForceTransparentFepModes |
+EAknEditorFlagNoEditIndicators |
+EAknEditorFlagFindPane;
+iEditor->SetAknEditorFlags( editorFlags );
+iEditor->CreateTextViewL();
+iInputFrame->SetInputContext( iBgContextOfFindPane );
+iEditor->SetSkinBackgroundControlContextL( iBgContextOfFindPane );
+TRgb textColor = KRgbBlack;
+TInt error = AknsUtils::GetCachedColor( AknsUtils::SkinInstance(),
+textColor,
+KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG19);
+if( !error )
+{
+TRAP_IGNORE( AknLayoutUtils::OverrideControlColorL(*iEditor, EColorLabelText, textColor) );
+}
 // Create label for page indicator
 iPageIndicator = new (ELeave) CEikLabel;
 iPageIndicator->SetObserver( this );
 iPageIndicator->SetContainerWindowL( *this );
 // 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()
 // -----------------------------------------------------------------------------
 //
 button->SetObserver( this );
 button->SetContainerWindowL( *this );
 button->SetBackground(this);
 button->SetTextColorIds( KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG65 );
 button->ActivateL();
-button->MakeVisible( EFalse );
 return button;
 }
 else
 {
 CleanupStack::PopAndDestroy( button );
 {
 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;
 {
 TRect controlPaneRect;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EControlPane,
 controlPaneRect );
 currentWindowRect.iBr.iY = controlPaneRect.iTl.iY;
+TRect mainPaneRect;
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
+mainPaneRect );
+CAknToolbar* toolbar = iAppUi->CurrentFixedToolbar();
+if ( !toolbar
+|| !toolbar->IsVisible()
+|| mainPaneRect.iBr.iX <= toolbar->Position().iX
+)
+{
+currentWindowRect.iBr.iX = mainPaneRect.iBr.iX;
+}
 }
 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 ) );
 TSize button_rect_size = button_rect.Size();
 //
 void CAknAdaptiveSearchGrid::Draw( CWindowGc& aGc, const CCoeControl& /*aControl*/,
 const TRect& aRect ) const
 {
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-TRgb color;
+aGc.SetBrushColor( KRgbWhite );
-TInt error = AknsUtils::GetCachedColor(skin, color, KAknsIIDFsTextColors,
+aGc.SetPenColor( KRgbBlack );
-		   EAknsCIFsTextColorsCG3 );
-if( error == KErrNone )
-{
-aGc.SetBrushColor( color );
-aGc.SetPenColor( color );
-}
-else
-{
-aGc.SetBrushColor( KRgbWhite );
-aGc.SetPenColor( KRgbBlack );
-}
 aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
 aGc.DrawRect( aRect );
 }
 // -----------------------------------------------------------------------------
 InitGridButtons();
 GridButtonsPositions();
 }
 // -----------------------------------------------------------------------------
+// CAknAdaptiveSearchGrid::MopSupplyObject
+// Retrieves an object of the same type as that encapsulated in aId.
+// -----------------------------------------------------------------------------
+//
+TTypeUid::Ptr CAknAdaptiveSearchGrid::MopSupplyObject( TTypeUid aId )
+{
+if ( aId.iUid == MAknsControlContext::ETypeId && iSkinContextOfFindPane )
+{
+return MAknsControlContext::SupplyMopObject( aId, iSkinContextOfFindPane );
+}
+return MAknsControlContext::SupplyMopObject( aId, NULL );
+}
+// -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::CountComponentControls
 // Gets the number of controls contained in a compound control.
 // -----------------------------------------------------------------------------
 //
 TInt CAknAdaptiveSearchGrid::CountComponentControls() const
 {
-// buttons + controls
+// buttons + controls + search field ( editor, input frame )
-return iButtonArray.Count()+5;
+return iButtonArray.Count()+5+2;
 }
+// -----------------------------------------------------------------------------
+// Sets text into search field.
+// Gets one parameters:
+// const TDesC& aSearchTxt      - Reference to the text buffer.
+// -----------------------------------------------------------------------------
+//
+void CAknAdaptiveSearchGrid::SetSearchTextToFindPane( const TDesC& aSearchTxt )
+{
+_AKNDEBUG(
+_LIT( KClassName, "CAknAdaptiveSearchGrid" );
+_LIT( KFunctionName, "SetSearchTextToFindPane" );
+_LIT( KFormat, "[%S][%S] search text is: %S");
+_AKNTRACE( KFormat,
+&KClassName, &KFunctionName, &aSearchTxt );
+);
+TRAP_IGNORE( iEditor->SetTextL( &aSearchTxt ) );
+if ( iShown )
+{
+TRAP_IGNORE(iEditor->TextView()->SetCursorVisibilityL( TCursor::EFCursorFlashing,
+TCursor::EFCursorFlashing ));
+}
+TInt curPos = iEditor->TextLength();
+//This set selection all off
+TRAP_IGNORE( iEditor->SetSelectionL( curPos, curPos ) );
+iEditor->DrawNow();
+}
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::ComponentControlh
 // Gets the specified component of a compound control.
 // -----------------------------------------------------------------------------
 //
 return iCloseButton;
 case 3:
 return iDeleteButton;
 case 4:
 return iPageIndicator;
+case 5:
+return iInputFrame;
+case 6:
+return iEditor;
 default:
 return NULL;
 }
 }
 }
 // CAknAdaptiveSearchGrid::SetAdaptiveSearchGridVisibility
 // Shows or hides grid.
 // The position of the top left corner should be set in advance.
 // -----------------------------------------------------------------------------
 //
-void CAknAdaptiveSearchGrid::SetVisibilityL( TBool aVisible, TBool /*aSelectAll*/ )
+void CAknAdaptiveSearchGrid::SetVisibilityL( TBool aVisible, TBool aSelectAll )
 {
 _AKNTRACE( "[%s][%s] Visible : %d", "CAknAdaptiveSearchGrid", __FUNCTION__, aVisible );
 if ( aVisible )
 {
 SetFocus( ETrue);
 iCurrentPage = 1;
 ShowL();
+if ( iEditor )
+{
+iEditor->SetFocus( ETrue );
+TInt curPos = iEditor->TextLength();
+iEditor->SetCursorPosL( curPos, EFalse );
+if ( aSelectAll)
+{
+iEditor->SelectAllL();
+}
+}
 }
 else
 {
 HideL();
 }
 void CAknAdaptiveSearchGrid::ControlsPositions()
 {
 TRect cell_pane;
 TRect grid_pane = RectFromLayout( Rect(), AknLayoutScalable_Apps::grid_afind_pane( iLayoutOption ) );
+TRect find_pane;
+if(iPopupFindpane)
+{
+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 );
+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) );
 // For ELJG-7VC8Q2, move delete button up
 {
 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() )
 {
 {
 iNextButton->MakeVisible( ETrue );
 iPrevButton->MakeVisible( ETrue );
 iPageIndicator->MakeVisible( ETrue );
 }
-if(iGridChars)
+iCloseButton->MakeVisible( ETrue );
-{
+iDeleteButton->MakeVisible( ETrue );
-iCloseButton->MakeVisible( ETrue );
+iInputFrame->MakeVisible( ETrue );
-iDeleteButton->MakeVisible( ETrue );
+iEditor->MakeVisible( ETrue );
-}
-else
-{
-iCloseButton->MakeVisible( EFalse );
-iDeleteButton->MakeVisible( EFalse );
-}
 }
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::AdaptiveSearchGridShowL()
 // Makes adaptive search grid visible and activates it.
 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;
 }
 _AKNTRACE_FUNC_ENTER;
 if ( !iShown ) // nothing to hide
 {
 return;
 }
+iEditor->TextView()->SetCursorVisibilityL(
+TCursor::EFCursorInvisible, TCursor::EFCursorInvisible);
 SetFocus( EFalse );
 //fix for TSW error EKDN-7KW9P2
 SetShown( EFalse );
 if( iAdaptiveSearchGridObserver )
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::FocusChanged
 // This function is called whenever a control gains or loses focus.
 // -----------------------------------------------------------------------------
 //
-void CAknAdaptiveSearchGrid::FocusChanged( TDrawNow /*aDrawNow*/ )
+void CAknAdaptiveSearchGrid::FocusChanged( TDrawNow aDrawNow )
 {
 if ( !iShown || IsNonFocusing() )
 {
 return; // nothing should be done in this case
 }
 if ( !IsFocused() && iLastFocusedButton )
 iLastFocusedButton->ResetState();
+iInputFrame->SetFocus( IsFocused(), aDrawNow );
 }
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::HandleWsEventL
 if( aEvent.Type() == EEventPointer )
 {
 TPointerEvent& pointerEvent = *aEvent.Pointer();
 if( pointerEvent.iType == TPointerEvent::EButton1Down )
 {
-if ( !iFindpaneRect.Contains( pointerEvent.iPosition ) &&
+if( iInputFrame->Rect().Contains(pointerEvent.iPosition) ||
 aDestination != this )
 {
+MTouchFeedback* feedback = MTouchFeedback::Instance();
+// according to Touch UI spec tapping on input frame should cause feedback,
+// even if action is to cancel dialog..
+if ( feedback )
+{
+feedback->InstantFeedback( this, ETouchFeedbackBasic );
+}
 HideL();
 return;
 }
 }
 }
 }
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::HandleControlEventL
 {
 break;
 }
 }
 _AKNTRACE_FUNC_EXIT;
 }
-static CAknButton* GetButtonHelper( RPointerArray<CAknButton> &aButtonArray, TInt aIndex )
-{
-return ( aIndex < aButtonArray.Count() && aIndex >= 0 ) ? aButtonArray[aIndex] : NULL;
-}
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::UpdateVisibleButtonsL()
 // -----------------------------------------------------------------------------
 //
 // Hide all the buttons at the beginning for now.
 CAknButton* tmpButton = NULL;
 for( TInt i = 0; i < iButtonArray.Count(); i++ )
 {
-tmpButton = GetButtonHelper( iButtonArray, i );
+tmpButton = static_cast<CAknButton*>( iButtonArray[i] );
-if ( NULL != tmpButton )
+tmpButton->MakeVisible( EFalse );
-{
-tmpButton->MakeVisible( EFalse );
-}
 }
 TInt tempTotalGridButtons = iTotalGridButtons - KCloseAndClearButtonCount;
 if( iNumOfPages == 1 )
 {
 for ( TInt i = 0; i < tempTotalGridButtons; i++ )
 {
-button = GetButtonHelper( iButtonArray, tempTotalGridButtons-i-1 );
+button = static_cast<CAknButton*>( iButtonArray[tempTotalGridButtons-i-1] );
-if ( NULL == button )
-{
-continue;
-}
 TInt charPosition = numOfChars-i-1-shift_Ind;
 if ( charPosition >= 0 )
 {
 bState = button->State();
 if ( ptr.Mid(charPosition, 1) == KSpaceCharacter )
 bState->SetTextL( KNullDesC );
 bState->SetIcon( icon );
 button->SetIconSize( iButtonIconSize );
 }
 else
 {
 if( bState->Icon() )
 {
 bState->SetIcon( NULL );
 }
 // If Devanagari
 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
 {
 // last page
 TInt charsOnLastPage = numOfChars -  numOfCharsInPrevPages;
 TInt offset = tempTotalGridButtons - charsOnLastPage;
 for ( TInt i = tempTotalGridButtons-1 ; i >= 0 ; --i )
 {
-button = GetButtonHelper( iButtonArray, i+shift_Ind );
+button = static_cast<CAknButton*>(iButtonArray[i+shift_Ind]);
-if ( NULL == button )
-{
-continue;
-}
 if( i < offset )
 {
 button->MakeVisible( EFalse );
 }
 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 );
 }
 }
 }
 shift_Ind = 0;
 for ( TInt i = 0; i < numOfChars; i++ )
 {
 if ( ( i >= start) && (i < end) )
 {
-button = GetButtonHelper( iButtonArray, i-start-shift_Ind );
+button = static_cast<CAknButton*>(iButtonArray[i-start-shift_Ind]);
-if ( NULL == button )
-{
-continue;
-}
 bState = button->State();
 if( ptr.Mid(i, 1) == KSpaceCharacter )
 {
 // Create icon for space button
 icon = GetColorIconL( 4 );
 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 );
 }
 }
 {
 tempTotalGridButtons = iTotalGridButtons;
 }
 for ( TInt i = tempTotalGridButtons; i < tempTotalGridButtons+iNumOfCols; i++ )
 {
-button = GetButtonHelper( iButtonArray, i );
+button = static_cast<CAknButton*>(iButtonArray[i]);
-if ( NULL != button )
+button->MakeVisible( EFalse );
-{
-button->MakeVisible( EFalse );
-}
 }
 }
 }
 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 );
 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;
 }
-// -----------------------------------------------------------------------------
-// CAknAdaptiveSearch::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 )
-{
-//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 == iFindpaneRect )
-{
-return;
-}
-iFindpaneRect = aRect;
-iFindPaneSizeChanged = ETrue;
-}
 // End of File

branch	RCL_3
changeset 55	aecbbf00d063
parent 51	fcdfafb36fe7
child 56	d48ab3b357f1