MCL/sf/app/homescreen: comparison idlehomescreen/widgetmanager/src/wmmaincontainer.cpp

equal deleted inserted replaced

-:1b758917cafc
+:d721605b30d0
 // CWmMainContainer::CWmMainContainer()
 // ---------------------------------------------------------
 //
 CWmMainContainer::CWmMainContainer( CWmPlugin& aWmPlugin ) :
 iWmPlugin( aWmPlugin )
-	{
+{
 iWidgetsList = NULL;
 iFindbox = NULL;
 iFindPaneIsVisible = EFalse;
 iBgContext = NULL;
 iFocusMode = ENowhere;
 iClosingDown = ETrue;
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::~CWmMainContainer()
 // ---------------------------------------------------------
 //
 CWmMainContainer::~CWmMainContainer()
-	{
+{
 TRAP_IGNORE(DeactivateFindPaneL(EFalse));
-delete iWidgetLoader;
+if ( iWidgetLoader )
+{
+iWidgetLoader->SetObserver( NULL );
+delete iWidgetLoader;
+}
 RemoveCtrlsFromStack();
 Components().ResetAndDestroy();
 iWidgetsList = NULL;
 iPortalButtonOne = NULL;
 iPortalButtonTwo = NULL;
 iFindbox = NULL;
-	delete iBgContext;
+delete iBgContext;
-	delete iConfiguration;
+delete iConfiguration;
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::NewL
 // ---------------------------------------------------------
 //
 CWmMainContainer* CWmMainContainer::NewL(
 const TRect& aRect,
 CWmPlugin& aWmPlugin )
-	{
+{
-	CWmMainContainer* self = CWmMainContainer::NewLC(
+CWmMainContainer* self = CWmMainContainer::NewLC(
 aRect,
 aWmPlugin );
-	CleanupStack::Pop( self );
+CleanupStack::Pop( self );
-	return self;
+return self;
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::NewLC
 // ---------------------------------------------------------
 //
 CWmMainContainer* CWmMainContainer::NewLC(
 const TRect& aRect,
 CWmPlugin& aWmPlugin )
-	{
+{
-	CWmMainContainer* self = new (ELeave) CWmMainContainer( aWmPlugin );
+CWmMainContainer* self = new (ELeave) CWmMainContainer( aWmPlugin );
-	CleanupStack::PushL( self );
+CleanupStack::PushL( self );
-	self->ConstructL( aRect );
+self->ConstructL( aRect );
-	return self;
+return self;
-	}
+}
 // ---------------------------------------------------------
 // ScreenRect
 // rectangle representing the screen
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // CWmMainContainer::ConstructL
 // ---------------------------------------------------------
 //
 void CWmMainContainer::ConstructL(
-		const TRect& aRect )
+const TRect& aRect )
-	{
+{
 // Initialize control array
-	InitComponentArrayL();
+InitComponentArrayL();
-	Components().SetControlsOwnedExternally( ETrue );
+Components().SetControlsOwnedExternally( ETrue );
 // create the UI
 CreateWindowL();
-	// background context
+// background context
-	iBgContext = CAknsBasicBackgroundControlContext::NewL(
+iBgContext = CAknsBasicBackgroundControlContext::NewL(
-	        KAknsIIDQsnBgScreen, ScreenRect() , ETrue);
+KAknsIIDQsnBgScreen, ScreenRect() , ETrue);
 // load configuration
 iConfiguration = CWmConfiguration::NewL( iWmPlugin.ResourceLoader() );
-	// set up controls
+// set up controls
-	InitializeControlsL( aRect );
+InitializeControlsL( aRect );
-	// set size and activate
+// set size and activate
-	SetRect( aRect );
+SetRect( aRect );
 ActivateL();
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::SizeChanged
 // ---------------------------------------------------------
 //
 void CWmMainContainer::SizeChanged()
-	{
+{
-	CCoeControl::SizeChanged();
+CCoeControl::SizeChanged();
 iBgContext->SetRect( ScreenRect() );
-	LayoutControls();
+LayoutControls();
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::LayoutControls
 // ---------------------------------------------------------
 //
 void CWmMainContainer::LayoutControls()
-	{
+{
 TRect rect( Rect() );
 // determine layout type
 iLandscape = Layout_Meta_Data::IsLandscapeOrientation();
 iMirrored = Layout_Meta_Data::IsMirrored();
 // layout iPortalButtons
-	if ( iConfiguration->PortalButtonCount() == 1 )
+if ( iConfiguration->PortalButtonCount() == 1 )
-	    {
+{
-	    // one button
+// one button
-	    TAknWindowLineLayout btnPane = AknLayoutScalable_Apps
+TAknWindowLineLayout btnPane = AknLayoutScalable_Apps
-	       ::wgtman_btn_pane( iLandscape ? 1 : 0 ).LayoutLine();
+::wgtman_btn_pane( iLandscape ? 1 : 0 ).LayoutLine();
-	    AknLayoutUtils::LayoutControl( iPortalButtonOne, rect, btnPane );
+AknLayoutUtils::LayoutControl( iPortalButtonOne, rect, btnPane );
-	    }
+}
-	else
+else
-	    {
+{
-	    // two buttons
+// two buttons
 TInt variety = (iLandscape ? 3 : 2);
 TAknWindowLineLayout oviBtnLayout = AknLayoutScalable_Apps
 ::wgtman_btn_pane( variety ).LayoutLine();
 TAknWindowLineLayout operatorBtnLayout = AknLayoutScalable_Apps
 ::wgtman_btn_pane_cp_01( variety ).LayoutLine();
 else
 {
 AknLayoutUtils::LayoutControl( iPortalButtonOne, rect, oviBtnLayout );
 AknLayoutUtils::LayoutControl( iPortalButtonTwo, rect, operatorBtnLayout );
 }
-	    }
+}
-	// layout iWidgetsList
+// layout iWidgetsList
 TAknWindowLineLayout listPane = AknLayoutScalable_Apps
 ::listscroll_wgtman_pane( iLandscape ? 1 : 0 ).LayoutLine();
 if( iFindbox && iFindPaneIsVisible )
 {
-		TAknLayoutRect layoutRect;
+TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( rect, listPane );
-		iWidgetsList->SetRect( layoutRect.Rect() );
+iWidgetsList->SetRect( layoutRect.Rect() );
 HandleFindSizeChanged();
 }
 else
 {
 AknLayoutUtils::LayoutControl( iWidgetsList, rect, listPane );
 }
 DrawDeferred();
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::OfferKeyEventL
 // ---------------------------------------------------------
 //
 if ( !iClosingDown  )
 {
 TBool eatEvent( EFalse );
 TPointerEvent event( aPointerEvent );
-		if (aPointerEvent.iType == TPointerEvent::EButton1Down)
+if (aPointerEvent.iType == TPointerEvent::EButton1Down)
-			{
+{
-	        // Check if user clicked a child control
+// Check if user clicked a child control
-	        CCoeControl* control = FindChildControlByPoint( aPointerEvent.iPosition );
+CCoeControl* control = FindChildControlByPoint( aPointerEvent.iPosition );
-	        if ( control && !control->IsFocused() )
+if ( control && !control->IsFocused() )
-	            {
+{
-	            // remove focus from ALL other child controls.
+// remove focus from ALL other child controls.
-	            CCoeControlArray::TCursor cursor = Components().Begin();
+CCoeControlArray::TCursor cursor = Components().Begin();
-	            CCoeControl* c;
+CCoeControl* c;
-	            while ((c=cursor.Control<CCoeControl>()) != NULL )
+while ((c=cursor.Control<CCoeControl>()) != NULL )
-	                {
+{
-	                if ( c != control && c->IsFocused() ) c->SetFocus( EFalse );
+if ( c != control && c->IsFocused() ) c->SetFocus( EFalse );
-	                cursor.Next();
+cursor.Next();
-	                }
+}
-	            // Set focus to the control that was clicked
+// Set focus to the control that was clicked
-	            control->SetFocus( ETrue );
+control->SetFocus( ETrue );
-	            // update focus mode accordingly
+// update focus mode accordingly
-	            UpdateFocusMode();
+UpdateFocusMode();
-	            // repaint
+// repaint
-	            DrawDeferred();
+DrawDeferred();
-	            }
+}
-	        // stylus popup should not be opened when uninstalling.
+// stylus popup should not be opened when uninstalling.
-	        // ou1cimx1#302973
+// ou1cimx1#302973
-	        if ( control == iWidgetsList && iWidgetsList->IsFocused() )
+if ( control == iWidgetsList && iWidgetsList->IsFocused() )
-	             {
+{
-	             TInt itemIndex = iWidgetsList->CurrentListBoxItemIndex();
+TInt itemIndex = iWidgetsList->CurrentListBoxItemIndex();
-	             TBool itemPointed = iWidgetsList->View()->XYPosToItemIndex(
+TBool itemPointed = iWidgetsList->View()->XYPosToItemIndex(
-	                                     aPointerEvent.iPosition,
+aPointerEvent.iPosition,
-	                                     itemIndex );
+itemIndex );
-	             if ( itemIndex >= 0 && itemPointed )
+if ( itemIndex >= 0 && itemPointed )
-	                 {
+{
-	                 CWmWidgetData& data = iWidgetsList->WidgetData( itemIndex );
+CWmWidgetData& data = iWidgetsList->WidgetData( itemIndex );
-	                 if ( &data && data.IsUninstalling() )
+if ( &data && data.IsUninstalling() )
-	                     {
+{
 event.iType = TPointerEvent::EButton1Up;
-	                     eatEvent = ETrue;
+eatEvent = ETrue;
-	                     }
+}
-	                 }
+}
-	             }
+}
-			}
+}
-		// set downkey event to base class
+// set downkey event to base class
-		CCoeControl::HandlePointerEventL( aPointerEvent );
+CCoeControl::HandlePointerEventL( aPointerEvent );
-		// send key up event if selected widget is being uninstalled.
+// send key up event if selected widget is being uninstalled.
-		// stylus popup shouldn't be displayed for this item.
+// stylus popup shouldn't be displayed for this item.
-		if ( eatEvent )
+if ( eatEvent )
-		    {
+{
 CCoeControl::HandlePointerEventL( event );
-		    }
+}
 }
 }
 // ---------------------------------------------------------
 // CWmMainContainer::InitializeControlsL
 // ---------------------------------------------------------
 //
 void CWmMainContainer::InitializeControlsL( const TRect& /*aRect*/ )
-	{
+{
-	// Create portal buttons
+// Create portal buttons
 iPortalButtonOne = CWmPortalButton::NewL( this, 0 );
 iPortalButtonOne->SetMopParent( this );
 AddControlL( iPortalButtonOne, EPortalOne );
 if ( iConfiguration->PortalButtonCount() > 1 )
 {
 iWmPlugin,
 TRect(),
 this );
 iWidgetsList->SetMopParent( this );
 AddControlL( iWidgetsList, EWidgetsList );
-	iWidgetsList->ActivateL();
+iWidgetsList->ActivateL();
 iWidgetsList->SetListBoxObserver( this );
 // Create scroll bar.
 iWidgetsList->CreateScrollBarFrameL( ETrue );
 iWidgetsList->ScrollBarFrame()->SetScrollBarVisibilityL(
 // CWmMainContainer::StartLoadingWidgetsL
 // ---------------------------------------------------------
 //
 void CWmMainContainer::StartLoadingWidgetsL()
 {
-if ( iFindbox && iFindPaneIsVisible )
-{
-iFindbox->ResetL();
-CAknFilteredTextListBoxModel* m =
-static_cast <CAknFilteredTextListBoxModel*> ( iWidgetsList->Model() );
-if ( m && m->Filter() )
-{
-m->Filter()->ResetFilteringL();
-}
-iFindbox->SetSearchTextL( KNullDesC );
-iFindbox->DrawNow();
-}
 if ( !iWidgetLoader )
 {
 // create the widget loader AO
 iWidgetLoader = CWmWidgetLoaderAo::NewL( iWmPlugin, *iWidgetsList );
+iWidgetLoader->SetObserver( this );
 }
 iWidgetLoader->StartLoading();
 }
 // ---------------------------------------------------------
 // CWmMainContainer::HandleResourceChange
 // ---------------------------------------------------------
 //
 void CWmMainContainer::HandleResourceChange( TInt aType )
-	{
+{
 CCoeControl::HandleResourceChange( aType );
 if ( KEikDynamicLayoutVariantSwitch == aType )
 {
 TRect rect;
 AknLayoutUtils::LayoutMetricsRect(
 AknLayoutUtils::EMainPane, rect );
 SetRect( rect );
 // notify widgetlist
 iWidgetsList->HandleLayoutChanged();
 }
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::MopSupplyObject
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // CWmMainContainer::Draw
 // ---------------------------------------------------------
 //
 void CWmMainContainer::Draw( const TRect& aRect ) const
-	{
+{
-	CWindowGc& gc = SystemGc();
+CWindowGc& gc = SystemGc();
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
 AknsDrawUtils::Background( skin, cc, this, gc, aRect );
-	}
+}
 // ---------------------------------------------------------
 // CWmMainContainer::AddControlL
 // ---------------------------------------------------------
 //
 Components().AppendLC( aControl, aControlId ); // Ownership transfered
 CleanupStack::Pop(aControl);
 CAknView* view = iWmPlugin.ViewAppUi().View(
 TUid::Uid(EWmMainContainerViewId) );
 if ( view )
-		{
+{
 iWmPlugin.ViewAppUi().AddToStackL( *view, aControl );
-		}
+}
-	else
+else
-		{
+{
 iWmPlugin.ViewAppUi().AddToStackL( aControl );
-		}
+}
 aControl->MakeVisible( ETrue );
 }
 // ---------------------------------------------------------
 // CWmMainContainer::IsLoadingWidgets
 //store changed list order
 CWmPersistentWidgetOrder* widgetOrder =
 CWmPersistentWidgetOrder::NewL( iWmPlugin.FileServer() );
 CleanupStack::PushL( widgetOrder );
 widgetOrder->StoreL( iWidgetsList->OrderDataArray() );
 CleanupStack::PopAndDestroy( widgetOrder );
 }
 }
 // ---------------------------------------------------------------------------
 // keep focus & do nothing
 }
 else if ( aForeground )
 {
 // set init state when wm comes to foreground.
-		// remove focus from all controls when activating view.
+// remove focus from all controls when activating view.
 ResetFocus( EDrawNow );
 }
 }
 // ----------------------------------------------------
 // ----------------------------------------------------
 // CWmMainContainer::AdaptiveSearchTextChanged
 // ----------------------------------------------------
 //
-void CWmMainContainer::AdaptiveSearchTextChanged(
+void CWmMainContainer::AdaptiveSearchTextChanged( CAknSearchField* /*aSearchField*/ )
-CAknSearchField* aSearchField )
 {
 // fix for ou1cimx1#376818. aknfind will call drawDeferred for lisbox.
 // We need to be sure that button area is also drawn.
 DrawDeferred();
 }
+// ----------------------------------------------------
+// CWmMainContainer::LoadDone
+// ----------------------------------------------------
+//
+void CWmMainContainer::LoadDoneL( TBool aWidgetListChanged )
+{
+if ( aWidgetListChanged && iFindbox && iFindPaneIsVisible )
+{
+CAknFilteredTextListBoxModel* m =
+static_cast <CAknFilteredTextListBoxModel*> ( iWidgetsList->Model() );
+if ( m && m->Filter() )
+{
+m->Filter()->HandleItemArrayChangeL();
+}
+}
+}
 // End of File

branch	RCL_3
changeset 28	d721605b30d0
parent 26	1b758917cafc