equal
deleted
inserted
replaced
42 #ifdef RD_UI_TRANSITION_EFFECTS_LIST |
42 #ifdef RD_UI_TRANSITION_EFFECTS_LIST |
43 #include <aknlistloadertfx.h> |
43 #include <aknlistloadertfx.h> |
44 #include <aknlistboxtfxinternal.h> |
44 #include <aknlistboxtfxinternal.h> |
45 #endif //RD_UI_TRANSITION_EFFECTS_LIST |
45 #endif //RD_UI_TRANSITION_EFFECTS_LIST |
46 |
46 |
47 #include <aknpriv.hrh> |
47 |
48 |
48 |
49 // ---------------------------------------------------------------------------- |
49 // ---------------------------------------------------------------------------- |
50 // Extension class definition |
50 // Extension class definition |
51 // ---------------------------------------------------------------------------- |
51 // ---------------------------------------------------------------------------- |
52 // |
52 // |
733 return &iQueryValue; |
733 return &iQueryValue; |
734 } |
734 } |
735 |
735 |
736 EXPORT_C void CAknPopupSettingPage::SelectCurrentItemL() |
736 EXPORT_C void CAknPopupSettingPage::SelectCurrentItemL() |
737 { |
737 { |
|
738 #ifdef RD_TOUCH2 |
738 CAknPopupSettingList* list = PopupSettingListBox(); |
739 CAknPopupSettingList* list = PopupSettingListBox(); |
739 |
740 |
740 if ( ( list->ItemDrawer()->Flags() & |
741 if ( ( list->ItemDrawer()->Flags() & |
741 CListItemDrawer::ESingleClickDisabledHighlight ) |
742 CListItemDrawer::ESingleClickDisabledHighlight ) |
742 && list->CurrentItemIndex() != list->CurrentSelection() ) |
743 && list->CurrentItemIndex() != list->CurrentSelection() ) |
743 { |
744 { |
744 list->View()->SetCurrentItemIndex( list->CurrentSelection() ); |
745 list->View()->SetCurrentItemIndex( list->CurrentSelection() ); |
745 } |
746 } |
|
747 #endif // RD_TOUCH2 |
746 |
748 |
747 PopupSettingListBox()->SelectCurrentItemL(); |
749 PopupSettingListBox()->SelectCurrentItemL(); |
748 } |
750 } |
749 |
751 |
750 EXPORT_C void CAknPopupSettingPage::UpdateQueryValueL( MAknQueryValue* aQueryValue ) |
752 EXPORT_C void CAknPopupSettingPage::UpdateQueryValueL( MAknQueryValue* aQueryValue ) |
779 #endif |
781 #endif |
780 |
782 |
781 EXPORT_C void CAknPopupSettingPage::HandlePointerEventL(const TPointerEvent& aPointerEvent) |
783 EXPORT_C void CAknPopupSettingPage::HandlePointerEventL(const TPointerEvent& aPointerEvent) |
782 { |
784 { |
783 CAknListBoxSettingPage::HandlePointerEventL(aPointerEvent); |
785 CAknListBoxSettingPage::HandlePointerEventL(aPointerEvent); |
784 if ( TPointerEvent::EDrag == aPointerEvent.iType ) |
|
785 { |
|
786 if ( !( Rect().Contains( aPointerEvent.iPosition ) ) ) |
|
787 { |
|
788 // Clear focus if dragged outside popup |
|
789 PopupSettingListBox()->HandleResourceChange( KAknMessageFocusLost ); |
|
790 } |
|
791 } |
|
792 } |
786 } |
793 |
787 |
794 EXPORT_C void* CAknPopupSettingPage::ExtensionInterface( TUid /*aInterface*/ ) |
788 EXPORT_C void* CAknPopupSettingPage::ExtensionInterface( TUid /*aInterface*/ ) |
795 { |
789 { |
796 return NULL; |
790 return NULL; |