equal
deleted
inserted
replaced
310 // Returns the number of controls owned |
310 // Returns the number of controls owned |
311 // --------------------------------------------------------- |
311 // --------------------------------------------------------- |
312 // |
312 // |
313 TInt CCamInfoListBoxContainer::CountComponentControls() const |
313 TInt CCamInfoListBoxContainer::CountComponentControls() const |
314 { |
314 { |
315 return 1; |
315 return CCamContainerBase::CountComponentControls() + 1; |
316 } |
316 } |
317 |
317 |
318 // --------------------------------------------------------- |
318 // --------------------------------------------------------- |
319 // CCamInfoListBoxContainer::ComponentControl |
319 // CCamInfoListBoxContainer::ComponentControl |
320 // Returns the requested component control |
320 // Returns the requested component control |
321 // --------------------------------------------------------- |
321 // --------------------------------------------------------- |
322 // |
322 // |
323 CCoeControl* CCamInfoListBoxContainer::ComponentControl( TInt /*aIndex*/ ) const |
323 CCoeControl* CCamInfoListBoxContainer::ComponentControl( TInt aIndex ) const |
324 { |
324 { |
325 return iListBox; |
325 CCoeControl* control = CCamContainerBase::ComponentControl( aIndex ); |
|
326 if( control == NULL) |
|
327 { |
|
328 control = iListBox; |
|
329 } |
|
330 return control; |
326 } |
331 } |
327 |
332 |
328 // --------------------------------------------------------- |
333 // --------------------------------------------------------- |
329 // CCamInfoListBoxContainer::Draw |
334 // CCamInfoListBoxContainer::Draw |
330 // Draw control |
335 // Draw control |
409 } |
414 } |
410 iController.StartIdleTimer(); |
415 iController.StartIdleTimer(); |
411 |
416 |
412 // If the Ok button or shutter key is pressed, select the current item |
417 // If the Ok button or shutter key is pressed, select the current item |
413 if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || |
418 if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || |
414 ( aType == EEventKeyDown && |
419 ( aType == EEventKey && |
415 ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) |
420 ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) |
416 { |
421 { |
417 TKeyResponse response = iListBox->OfferKeyEventL( aKeyEvent, aType ); |
422 TKeyResponse response = iListBox->OfferKeyEventL( aKeyEvent, aType ); |
418 iView.HandleCommandL( EAknSoftkeySelect ); |
423 iView.HandleCommandL( EAknSoftkeySelect ); |
419 return response; |
424 return response; |