--- a/uifw/EikStd/coctlsrc/akntoolbarextension.cpp Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/EikStd/coctlsrc/akntoolbarextension.cpp Wed Sep 01 12:16:19 2010 +0100
@@ -22,6 +22,10 @@
#include <aknconsts.h>
#include <akntoolbar.h>
+#include <touchfeedback.h>
+#include <akntranseffect.h>
+#include <akntransitionutils.h>
+
#include "akntoolbarextensionview.h"
@@ -201,7 +205,23 @@
// construct view from resource, items are standard TBAR_CTRL structures
iView = CAknToolbarExtensionView::NewL( aReader, this );
- aReader.ReadInt32(); // extension
+ // Update the extension with given resource.
+ TInt extensionLink = aReader.ReadInt32(); // extension
+ if ( extensionLink != 0 )
+ {
+ CAknButtonState* state = State( 0 );
+ if ( state )
+ {
+ state->UpdateExtensionInfoL( extensionLink );
+ }
+ state = State( 1 );
+ if ( state )
+ {
+ state->UpdateExtensionInfoL( extensionLink );
+ }
+
+ }
+
}
// ---------------------------------------------------------------------------
@@ -293,6 +313,28 @@
iView->SetFocusing( !nonFocusing );
if ( IsVisible() )
{
+
+ //
+ // the pop up feedback for droping out toolbar extention view
+ //
+ if ( AknLayoutUtils::PenEnabled() )
+ {
+ MTouchFeedback* feedback = MTouchFeedback::Instance();
+ if ( feedback )
+ {
+ TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
+ if ( CAknTransitionUtils::TransitionsEnabled(
+ AknTransEffect::EComponentTransitionsOff ) )
+ {
+ fbLogicalType = ETouchFeedbackIncreasingPopUp;
+ }
+
+ feedback->InstantFeedback( this,
+ fbLogicalType,
+ ETouchFeedbackVibra, TPointerEvent() );
+ }
+ }
+
iToolbar->DynInitExtensionL( this );
iView->MakeVisible( ETrue ); // show view
}