diff -r 79311d856354 -r 7be2816dbabd idlehomescreen/widgetmanager/src/wmmaincontainer.cpp --- a/idlehomescreen/widgetmanager/src/wmmaincontainer.cpp Tue Apr 27 16:26:12 2010 +0300 +++ b/idlehomescreen/widgetmanager/src/wmmaincontainer.cpp Tue May 11 16:02:39 2010 +0300 @@ -953,14 +953,15 @@ { if ( iFindbox && iFindPaneIsVisible ) { - iFindbox->ResetL(); - iFindbox->SetSearchTextL( KNullDesC ); + iFindbox->ResetL(); CAknFilteredTextListBoxModel* m = static_cast ( iWidgetsList->Model() ); if ( m && m->Filter() ) { m->Filter()->ResetFilteringL(); } + iFindbox->SetSearchTextL( KNullDesC ); + iFindbox->DrawNow(); } if ( !iWidgetLoader ) { @@ -1009,12 +1010,12 @@ // CWmMainContainer::Draw // --------------------------------------------------------- // -void CWmMainContainer::Draw( const TRect& /*aRect*/ ) const +void CWmMainContainer::Draw( const TRect& aRect ) const { CWindowGc& gc = SystemGc(); MAknsSkinInstance* skin = AknsUtils::SkinInstance(); MAknsControlContext* cc = AknsDrawUtils::ControlContext( this ); - AknsDrawUtils::Background( skin, cc, this, gc, Rect() ); + AknsDrawUtils::Background( skin, cc, this, gc, aRect ); } // --------------------------------------------------------- @@ -1301,18 +1302,18 @@ iFindPaneIsVisible = EFalse; iWidgetsList->SetFindPaneIsVisible( EFalse ); + + // set soft key set + CEikButtonGroupContainer* cbaGroup = + CEikButtonGroupContainer::Current(); + TInt cbaResourceId = ( AknLayoutUtils::MSKEnabled() ? + R_AVKON_SOFTKEYS_OPTIONS_BACK__SELECT : + R_AVKON_SOFTKEYS_OPTIONS_BACK ); + cbaGroup->SetCommandSetL( cbaResourceId ); + if (aLayout) //no need to draw UI if exiting list { LayoutControls(); - - // set soft key set - CEikButtonGroupContainer* cbaGroup = - CEikButtonGroupContainer::Current(); - TInt cbaResourceId = ( AknLayoutUtils::MSKEnabled() ? - R_AVKON_SOFTKEYS_OPTIONS_BACK__SELECT : - R_AVKON_SOFTKEYS_OPTIONS_BACK ); - - cbaGroup->SetCommandSetL( cbaResourceId ); cbaGroup->DrawNow(); UpdateFocusMode();