equal
deleted
inserted
replaced
497 { |
497 { |
498 TRect controlPaneRect; |
498 TRect controlPaneRect; |
499 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EControlPane, |
499 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EControlPane, |
500 controlPaneRect ); |
500 controlPaneRect ); |
501 currentWindowRect.iBr.iY = controlPaneRect.iTl.iY; |
501 currentWindowRect.iBr.iY = controlPaneRect.iTl.iY; |
502 |
|
503 TRect mainPaneRect; |
|
504 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, |
|
505 mainPaneRect ); |
|
506 |
|
507 if ( 0 != iFindpaneRect.Size().iWidth |
|
508 && iFindpaneRect.Size().iWidth <= mainPaneRect.Size().iWidth ) |
|
509 { |
|
510 currentWindowRect.iBr.iX = currentWindowRect.iTl.iX |
|
511 + iFindpaneRect.Size().iWidth; |
|
512 } |
|
513 else |
|
514 { |
|
515 currentWindowRect.iBr.iX = currentWindowRect.iTl.iX |
|
516 + mainPaneRect.Size().iWidth; |
|
517 } |
|
518 } |
502 } |
519 |
503 |
520 TRect grid_pane = RectFromLayout( currentWindowRect, AknLayoutScalable_Apps::grid_afind_pane( iLayoutOption ) ); |
504 TRect grid_pane = RectFromLayout( currentWindowRect, AknLayoutScalable_Apps::grid_afind_pane( iLayoutOption ) ); |
521 TRect button_rect = RectFromLayout( grid_pane, AknLayoutScalable_Apps::cell_afind_pane( iLayoutOption, 0, 0 ) ); |
505 TRect button_rect = RectFromLayout( grid_pane, AknLayoutScalable_Apps::cell_afind_pane( iLayoutOption, 0, 0 ) ); |
522 TSize button_rect_size = button_rect.Size(); |
506 TSize button_rect_size = button_rect.Size(); |
1161 if( aEvent.Type() == EEventPointer ) |
1145 if( aEvent.Type() == EEventPointer ) |
1162 { |
1146 { |
1163 TPointerEvent& pointerEvent = *aEvent.Pointer(); |
1147 TPointerEvent& pointerEvent = *aEvent.Pointer(); |
1164 |
1148 |
1165 if( pointerEvent.iType == TPointerEvent::EButton1Down ) |
1149 if( pointerEvent.iType == TPointerEvent::EButton1Down ) |
1166 { |
1150 { |
1167 if ( !iFindpaneRect.Contains( pointerEvent.iPosition ) && |
1151 if ( !iFindpaneRect.Contains( pointerEvent.iPosition ) && |
1168 aDestination != this ) |
1152 aDestination != this ) |
1169 { |
1153 { |
1170 MTouchFeedback* feedback = MTouchFeedback::Instance(); |
1154 HideL(); |
1171 |
1155 return; |
1172 // according to Touch UI spec tapping on input frame should cause feedback, |
|
1173 // even if action is to cancel dialog.. |
|
1174 if ( feedback ) |
|
1175 { |
|
1176 feedback->InstantFeedback( this, ETouchFeedbackBasic ); |
|
1177 } |
1156 } |
1178 |
1157 } |
1179 HideL(); |
1158 } |
1180 return; |
|
1181 } |
|
1182 } |
|
1183 } |
|
1184 } |
1159 } |
1185 |
1160 |
1186 |
1161 |
1187 // ----------------------------------------------------------------------------- |
1162 // ----------------------------------------------------------------------------- |
1188 // CAknAdaptiveSearchGrid::HandleControlEventL |
1163 // CAknAdaptiveSearchGrid::HandleControlEventL |