diff -r 868cceedabd3 -r 92a061761a7b browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp --- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Dec 17 08:47:18 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Jan 07 12:48:02 2010 +0200 @@ -38,11 +38,8 @@ #include #include -#include #include -#include #include -#include #include #include "CommonConstants.h" @@ -50,7 +47,7 @@ #include "BrowserAppUi.h" #include "BrowserUtil.h" #include "browser.hrh" -#include "favouriteslimits.h" +#include #include "BrowserAdaptiveListPopup.h" #include "BrowserContentView.h" @@ -233,18 +230,10 @@ EAknEditorNumericInputMode ); } TInt editorFlags = ((iFindKeywordMode) ? EAknEditorFlagDefault : EAknEditorFlagLatinInputModesOnly) |EAknEditorFlagUseSCTNumericCharmap; -#ifdef RD_INTELLIGENT_TEXT_INPUT - TInt physicalKeyboards = 0; - CRepository* aknFepRepository = CRepository::NewL( KCRUidAknFep ); - User::LeaveIfNull( aknFepRepository ); - aknFepRepository->Get( KAknFepPhysicalKeyboards, physicalKeyboards ); - delete aknFepRepository; + // Always disable T9 input for goto url + editorFlags = (editorFlags | EAknEditorFlagNoT9); - if ( physicalKeyboards && EPtiKeyboardQwerty3x11 ) { - editorFlags = (editorFlags | EAknEditorFlagNoT9); - } -#endif iEditor->SetAknEditorFlags( editorFlags ); iEditor->SetAknEditorPermittedCaseModes ( EAknEditorUpperCase | @@ -301,10 +290,9 @@ // void CBrowserGotoPane::HandleFindSizeChanged() { - if ( !AknLayoutUtils::PenEnabled() ) + + if ( iSearchEditor && !iFindKeywordMode) { - if ( iSearchEditor && !iFindKeywordMode) - { TRect clientRect = CBrowserAppUi::Static()->ClientRect(); TAknWindowLineLayout findWindow = AknLayout::popup_find_window(); @@ -314,9 +302,11 @@ // Now Increase the height of rect to make room for two editors (Goto + search)// findWindowRect.iTl.iY -= ( findWindow.iH ); SetRect( findWindowRect ); - } - else - { + } + + else if ( !AknLayoutUtils::PenEnabled() ) + { + TRect parentrect = iAvkonAppUi->ApplicationRect(); TAknLayoutRect lrect; @@ -326,9 +316,8 @@ AknLayoutUtils::LayoutControl ( this, lrect.Rect(), AknLayout::popup_find_window() ); - } } - else + else if( AknLayoutUtils::PenEnabled() ) { // The ClientRect() will be the application rectangle minus any // toolbars/menu bars etc.