uifw/EikStd/coctlsrc/AknToolbar.cpp
branchRCL_3
changeset 16 71dd06cfe933
parent 10 9f56a4e1b8ab
child 38 c52421ed5f07
equal deleted inserted replaced
15:08e69e956a8c 16:71dd06cfe933
  1134                         if ( ii != iDownItem && !button->IsDimmed() )
  1134                         if ( ii != iDownItem && !button->IsDimmed() )
  1135                             {
  1135                             {
  1136                             MTouchFeedback* feedback = MTouchFeedback::Instance();
  1136                             MTouchFeedback* feedback = MTouchFeedback::Instance();
  1137                             if ( feedback )
  1137                             if ( feedback )
  1138                                 {
  1138                                 {
  1139                                 feedback->InstantFeedback( ETouchFeedbackBasicButton );
  1139                                 feedback->InstantFeedback( button,
       
  1140                                                            ETouchFeedbackBasicButton,
       
  1141                                                            ETouchFeedbackVibra,
       
  1142                                                            aPointerEvent );
  1140                                 }
  1143                                 }
  1141                             }
  1144                             }
  1142                 
  1145                 
  1143                         button->HandlePointerEventL( aPointerEvent );
  1146                         button->HandlePointerEventL( aPointerEvent );
  1144                         override = ETrue;
  1147                         override = ETrue;
  2042         SetOrdinalPositions();
  2045         SetOrdinalPositions();
  2043         }
  2046         }
  2044 
  2047 
  2045     CWindowGc& gc = SystemGc();
  2048     CWindowGc& gc = SystemGc();
  2046     MAknsSkinInstance* skin = AknsUtils::SkinInstance();
  2049     MAknsSkinInstance* skin = AknsUtils::SkinInstance();
  2047     // Draw background         
  2050     
  2048     if ( iFlags & KAknToolbarFixed && 
  2051     //
       
  2052     // Draw background
       
  2053     //
       
  2054     if ( iFlags & KAknToolbarFixed && !( iFlags & KAknToolbarNoBackground ) &&
  2049          iBgRect.Height() > 0 &&
  2055          iBgRect.Height() > 0 &&
  2050          iBgRect.Width() > 0 )
  2056          iBgRect.Width() > 0 )
  2051         {
  2057         {
  2052         if ( aRect.Intersects( iBgRect ) )
  2058         if ( aRect.Intersects( iBgRect ) )
  2053             {
  2059             {
  3112             aGridPaneRect = TRect( TPoint(), aToolbarRect.Size() ); 
  3118             aGridPaneRect = TRect( TPoint(), aToolbarRect.Size() ); 
  3113 
  3119 
  3114 
  3120 
  3115             aCellPaneRect = RectFromLayout( aGridPaneRect,     
  3121             aCellPaneRect = RectFromLayout( aGridPaneRect,     
  3116                 AknLayoutScalable_Avkon::cell_sctrl_middle_pane( 0, 0, 0 ) );
  3122                 AknLayoutScalable_Avkon::cell_sctrl_middle_pane( 0, 0, 0 ) );
  3117 
       
  3118             //
       
  3119             // fixing bug: ELJG-7XX8RE
       
  3120             // (Two extra black lines are displayed around toolbar area at first)
       
  3121             // extend the toolbar size by hard code
       
  3122             //
       
  3123             aToolbarRect.iTl.iY -= 1;
       
  3124             aToolbarRect.iBr.iY += 1;
       
  3125             }
  3123             }
  3126         }
  3124         }
  3127     else
  3125     else
  3128         {
  3126         {
  3129         if ( iOrientation == EAknOrientationHorizontal )
  3127         if ( iOrientation == EAknOrientationHorizontal )