--- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Fri May 08 08:18:43 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Fri Jul 03 15:46:41 2009 +0100
@@ -487,7 +487,15 @@
return EKeyWasConsumed; // Ignore diagonal navigation events here
}
- if ( (aKeyEvent.iCode == EKeyOK ) && iGPObserver && IsFocused() )
+ // For touch UI, handle enter key from VKB as a "GOTO"
+ if (AknLayoutUtils::PenEnabled() && aKeyEvent.iCode == EKeyEnter)
+ {
+ CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneGoTo);
+ return EKeyWasConsumed;
+ }
+ else if ( ((aKeyEvent.iCode == EKeyOK ) || (aKeyEvent.iCode == EKeyEnter))
+ && iGPObserver
+ && IsFocused() )
{
if ( CBrowserAppUi::Static()->ContentView()->MenuBar()->MenuPane()->IsVisible() )
{
@@ -495,17 +503,13 @@
}
else
{
+ // If there is an observer and we have the focus, enter key is
+ // consumed and observer is notified.
iGPObserver->HandleGotoPaneEventL
( this, MGotoPaneObserver::EEventEnterKeyPressed );
- return EKeyWasConsumed; // If there is an observer and we have the focus,
- } // enter key is consumed and observer is notified.
- }
-
- else if (AknLayoutUtils::PenEnabled() && aKeyEvent.iCode == EKeyEnter)
- { // For touch UI, handle enter key from VKB as a "GOTO"
- CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneGoTo);
- return EKeyWasConsumed;
- }
+ return EKeyWasConsumed;
+ }
+ }
if ( iSearchEditor && iSearchPaneActive )
{