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

equal deleted inserted replaced

-:fb3763350a08
+:4d54b72983ae
 // CWmMainContainer::LayoutControls
 // ---------------------------------------------------------
 //
 void CWmMainContainer::LayoutControls()
 	{
-TBool landscape = Layout_Meta_Data::IsLandscapeOrientation();
+TRect rect( Rect() );
-TAknWindowLineLayout listPane =
+// determine layout type
-AknLayoutScalable_Apps::listscroll_wgtman_pane(landscape ? 1 : 0).LayoutLine();
+iLandscape = Layout_Meta_Data::IsLandscapeOrientation();
+iMirrored = Layout_Meta_Data::IsMirrored();
-TAknWindowLineLayout btnPane =
-AknLayoutScalable_Apps::wgtman_btn_pane(landscape ? 1 : 0).LayoutLine();
+// layout iPortalButtons
+	if ( iConfiguration->PortalButtonCount() == 1 )
-	TRect rect = Rect();
-	if ( landscape )
 	    {
-if ( Layout_Meta_Data::IsMirrored() )
+	    // one button
-{
+	    TAknWindowLineLayout btnPane = AknLayoutScalable_Apps
-iLayout = ELandscapeMirrored;
+	       ::wgtman_btn_pane( iLandscape ? 1 : 0 ).LayoutLine();
-}
+	    AknLayoutUtils::LayoutControl( iPortalButtonOne, rect, btnPane );
-else
-{
-iLayout = ELandscape;
-}
 	    }
 	else
 	    {
-iLayout = EPortrait;
+	    // two buttons
+// **********************************
+// we do not have layouts for two buttons yet - layout manually
+TAknWindowLineLayout btnPane = AknLayoutScalable_Apps
+::wgtman_btn_pane( iLandscape ? 1 : 0 ).LayoutLine();
+	    TAknLayoutRect layoutrect;
+	    layoutrect.LayoutRect( rect, btnPane );
+	    TRect r( layoutrect.Rect() );
+	    TRect r1, r2;
+	    const TInt gap = 3;
+	    if ( iLandscape )
+	        {
+	        r1 = TRect( r.iTl, TSize( r.Width(), r.Height() / 2 - gap ) );
+	        r2 = r1;
+r2.Move( 0, r.Height() / 2 + gap );
+	        }
+	    else
+	        {
+r1 = TRect( r.iTl, TSize( r.Width() / 2 - gap, r.Height() ) );
+r2 = r1;
+if (iMirrored) r1.Move( r.Width() / 2 + gap, 0 );
+else r2.Move( r.Width() / 2 + gap, 0 );
+}
+iPortalButtonOne->SetRect( r1 );
+iPortalButtonTwo->SetRect( r2 );
+// *************************************
 	    }
-// portal button layout
+	// layout iWidgetsList
-	// todo: 2-button layout
+TAknWindowLineLayout listPane = AknLayoutScalable_Apps
-AknLayoutUtils::LayoutControl( iPortalButtonOne, rect, btnPane );
+::listscroll_wgtman_pane( iLandscape ? 1 : 0 ).LayoutLine();
 if( iFindbox && iFindPaneIsVisible )
 {
 		TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( rect, listPane );
 		iWidgetsList->SetRect( layoutRect.Rect() );
 if ( iWidgetsList->IsFocused() )
 {
 // ------------------------------------
 // focus is in the WIDGETS LIST
 // ------------------------------------
-if ( iLayout == EPortrait &&
+if ( !iLandscape &&
 aKeyEvent.iScanCode == EStdKeyUpArrow &&
 iWidgetsList->CurrentItemIndex() == 0 )
 {
 // widget list top -> up -> ovi button (portrait)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 0 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == EPortrait &&
+else if ( !iLandscape &&
 aKeyEvent.iScanCode == EStdKeyDownArrow &&
 iWidgetsList->CurrentItemIndex() ==
 iWidgetsList->Model()->NumberOfItems() - 1 )
 {
 // widget list bottom -> down -> ovi button (portrait)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 0 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == ELandscape &&
+else if ( iLandscape && !iMirrored &&
 aKeyEvent.iScanCode == EStdKeyRightArrow )
 {
-// widget list -> right -> ovi button (landscape)
+// widget list -> right -> ovi button (landscape normal)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 0 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == ELandscapeMirrored &&
+else if ( iLandscape && iMirrored &&
 aKeyEvent.iScanCode == EStdKeyLeftArrow )
 {
 // widget list -> left -> ovi button (landscape mirrored)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 0 );
 else if ( iPortalButtonOne->IsFocused() )
 {
 // ------------------------------------
 // focus is in the FIRST PORTAL BUTTON
 // ------------------------------------
-if ( iLayout == EPortrait &&
+if ( !iLandscape &&
 aKeyEvent.iScanCode == EStdKeyDownArrow )
 {
-// left portal -> down -> widget list top
+// left portal -> down -> widget list top (portrait)
 if ( aType == EEventKey )
 SetFocusToWidgetList( 0 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == EPortrait &&
+else if ( !iLandscape &&
 aKeyEvent.iScanCode == EStdKeyUpArrow )
 {
-// left portal -> up -> widget list bottom
+// left portal -> up -> widget list bottom (portrait)
 if ( aType == EEventKey )
 SetFocusToWidgetList( iWidgetsList->Model()->NumberOfItems()-1 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == EPortrait &&
+else if ( !iLandscape && !iMirrored &&
 aKeyEvent.iScanCode == EStdKeyRightArrow &&
 iConfiguration->PortalButtonCount() > 1 )
 {
-// left portal -> right -> right portal
+// left portal -> right -> right portal (portrait normal)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 1 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == ELandscape &&
+else if ( !iLandscape && iMirrored &&
+aKeyEvent.iScanCode == EStdKeyLeftArrow &&
+iConfiguration->PortalButtonCount() > 1 )
+{
+// right portal -> left -> left portal (portrait mirrored)
+if ( aType == EEventKey )
+SetFocusToPortalButton( 1 );
+keyResponse = EKeyWasConsumed;
+}
+else if ( iLandscape && !iMirrored &&
 aKeyEvent.iScanCode == EStdKeyLeftArrow )
 {
-// upper portal -> left -> widget list
+// upper portal -> left -> widget list (landscape normal)
 if ( aType == EEventKey )
 SetFocusToWidgetList();
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == ELandscapeMirrored &&
+else if ( iLandscape && iMirrored &&
 aKeyEvent.iScanCode == EStdKeyRightArrow )
 {
-// upper portal -> right -> widget list (mirrored)
+// upper portal -> right -> widget list (landscape mirrored)
 if ( aType == EEventKey )
 SetFocusToWidgetList();
 keyResponse = EKeyWasConsumed;
 }
-else if ( ( iLayout == ELandscape ||
+else if ( iLandscape &&
-iLayout == ELandscapeMirrored ) &&
 aKeyEvent.iScanCode == EStdKeyDownArrow &&
 iConfiguration->PortalButtonCount() > 1 )
 {
-// upper portal -> down -> lower portal
+// upper portal -> down -> lower portal (landscape)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 1 );
 keyResponse = EKeyWasConsumed;
 }
 }
 else if ( iPortalButtonTwo && iPortalButtonTwo->IsFocused() )
 {
 // ------------------------------------
 // focus is in the SECOND PORTAL BUTTON
 // ------------------------------------
-if ( iLayout == EPortrait &&
+if ( !iLandscape &&
 aKeyEvent.iScanCode == EStdKeyDownArrow )
 {
-// right portal -> down -> widget list top
+// right portal -> down -> widget list top (portrait)
 if ( aType == EEventKey )
 SetFocusToWidgetList( 0 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == EPortrait &&
+else if ( !iLandscape &&
 aKeyEvent.iScanCode == EStdKeyUpArrow )
 {
-// right portal -> up -> widget list bottom
+// right portal -> up -> widget list bottom (portrait)
 if ( aType == EEventKey )
 SetFocusToWidgetList( iWidgetsList->Model()->NumberOfItems()-1 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == EPortrait &&
+else if ( !iLandscape && !iMirrored &&
+aKeyEvent.iScanCode == EStdKeyLeftArrow &&
+iConfiguration->PortalButtonCount() > 1 )
+{
+// right portal -> left -> left portal (portrait normal)
+if ( aType == EEventKey )
+SetFocusToPortalButton( 0 );
+keyResponse = EKeyWasConsumed;
+}
+else if ( !iLandscape && iMirrored &&
 aKeyEvent.iScanCode == EStdKeyRightArrow &&
 iConfiguration->PortalButtonCount() > 1 )
 {
-// right portal -> right -> left portal
+// left portal -> right -> right portal (portrait mirrored)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 0 );
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == ELandscape &&
+else if ( iLandscape && !iMirrored &&
 aKeyEvent.iScanCode == EStdKeyLeftArrow )
 {
-// lower portal -> left -> widget list
+// lower portal -> left -> widget list (landscape normal)
 if ( aType == EEventKey )
 SetFocusToWidgetList();
 keyResponse = EKeyWasConsumed;
 }
-else if ( iLayout == ELandscapeMirrored &&
+else if ( iLandscape && iMirrored &&
 aKeyEvent.iScanCode == EStdKeyRightArrow )
 {
-// lower portal -> right -> widget list (mirrored)
+// lower portal -> right -> widget list (landscape mirrored)
 if ( aType == EEventKey )
 SetFocusToWidgetList();
 keyResponse = EKeyWasConsumed;
 }
-else if ( ( iLayout == ELandscape ||
+else if ( iLandscape &&
-iLayout == ELandscapeMirrored ) &&
 aKeyEvent.iScanCode == EStdKeyUpArrow )
 {
-// lower portal -> up -> upper portal
+// lower portal -> up -> upper portal (landscape)
 if ( aType == EEventKey )
 SetFocusToPortalButton( 0 );
 keyResponse = EKeyWasConsumed;
 }
 }
 	            // set focus to selected list box item.
 if ( control == iWidgetsList )
 {
 TInt itemIndex = iWidgetsList->CurrentListBoxItemIndex();
 TBool itemPointed = iWidgetsList->View()->XYPosToItemIndex(
-aPointerEvent.iParentPosition,
+aPointerEvent.iPosition,
 itemIndex );
-if ( itemIndex >= 1 && itemPointed )
+if ( itemIndex >= 0 && itemPointed )
 {
-iWidgetsList->SetCurrentItemIndex( itemIndex - 1 );
+iWidgetsList->SetCurrentItemIndex( itemIndex );
 }
 }
-	            // Set focus to the control that was clicked
-	            control->SetFocus( ETrue );
 	            // remove focus from ALL other child controls.
 	            CCoeControlArray::TCursor cursor = Components().Begin();
 	            CCoeControl* c;
 	            while ((c=cursor.Control<CCoeControl>()) != NULL )
 	                {
 	                if ( c != control && c->IsFocused() ) c->SetFocus( EFalse );
 	                cursor.Next();
 	                }
+	            // Set focus to the control that was clicked
+	            control->SetFocus( ETrue );
 	            // update focus mode accordingly
 	            UpdateFocusMode();
 	            // repaint
 	            DrawDeferred();
 	            }
 iWmPlugin.ViewAppUi().AddToStackL( aControl );
 aControl->MakeVisible( ETrue );
 }
 // ---------------------------------------------------------
-// CWmMainContainer::WmPlugin
-// ---------------------------------------------------------
-//
-CWmPlugin& CWmMainContainer::WmPlugin()
-{
-return iWmPlugin;
-}
-// ---------------------------------------------------------
 // CWmMainContainer::PortalSelected
 // ---------------------------------------------------------
 //
 TBool CWmMainContainer::PortalSelected()
 {
 // CWmMainContainer::CanDoDetails
 // ---------------------------------------------------------
 //
 TBool CWmMainContainer::CanDoDetails()
 {
-return WidgetSelected();
+return ( WidgetSelected() && iWidgetsList->WidgetData() );
 }
 // ---------------------------------------------------------
 // CWmMainContainer::CanDoHelp
 // ---------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CWmMainContainer::HandleListBoxEventL(
 CEikListBox* /*aListBox*/, TListBoxEvent aEventType )
 {
-if ( !iClosingDown && ( aEventType == EEventEnterKeyPressed ||
+if ( aEventType == EEventEnterKeyPressed ||
-aEventType == EEventItemSingleClicked ) )
+aEventType == EEventItemSingleClicked )
 {
-AddWidgetToHomeScreenL();
+if ( iFindPaneIsVisible )
+{
+DeactivateFindPaneL();
+}
+else if ( !iClosingDown )
+{
+AddWidgetToHomeScreenL();
+}
 }
 }
 // ----------------------------------------------------
 // CWmMainContainer::LaunchDetailsDialogL

changeset 4	4d54b72983ae
parent 2	08c6ee43b396
child 5	c743ef5928ba