69 #include "BrowserAppUi.h" |
69 #include "BrowserAppUi.h" |
70 #include "BrowserGotoPane.h" |
70 #include "BrowserGotoPane.h" |
71 #include "Preferences.h" |
71 #include "Preferences.h" |
72 #include "BrowserPreferences.h" |
72 #include "BrowserPreferences.h" |
73 #include "Display.h" |
73 #include "Display.h" |
74 #include "favouriteswapap.h" |
74 #include <favouriteswapap.h> |
75 #include "BrowserBookmarksModel.h" |
75 #include "BrowserBookmarksModel.h" |
76 #include "BrowserDialogs.h" |
76 #include "BrowserDialogs.h" |
77 #include "BrowserUtil.h" |
77 #include "BrowserUtil.h" |
78 #include "BrowserBmOTABinSender.h" |
78 #include "BrowserBmOTABinSender.h" |
79 #include <FINDITEMMENU.RSG> |
79 #include <FINDITEMMENU.RSG> |
80 #include "BrowserUiVariant.hrh" |
80 #include "BrowserUiVariant.hrh" |
81 #include "BrowserAdaptiveListPopup.h" |
81 #include "BrowserAdaptiveListPopup.h" |
82 #include "BrowserApplication.h" |
82 #include "BrowserApplication.h" |
83 #include "logger.h" |
83 #include "logger.h" |
84 #include "favouritesfile.h" |
84 #include <favouritesfile.h> |
85 #include "BrowserWindowManager.h" |
85 #include "BrowserWindowManager.h" |
86 #include "BrowserWindow.h" |
86 #include "BrowserWindow.h" |
87 #include "BrowserPopupEngine.h" |
87 #include "BrowserPopupEngine.h" |
88 |
88 |
89 #include <brctldialogsprovider.h> |
89 #include <brctldialogsprovider.h> |
246 // Disabling FullScreen for non-touch devices, before processing some dialog-based shortcut and toolbar actions |
246 // Disabling FullScreen for non-touch devices, before processing some dialog-based shortcut and toolbar actions |
247 if ( !iPenEnabled && iContentFullScreenMode && ( ( aCommand == EWmlCmdFindKeyword ) || |
247 if ( !iPenEnabled && iContentFullScreenMode && ( ( aCommand == EWmlCmdFindKeyword ) || |
248 ( aCommand == EWmlCmdHistory ) || |
248 ( aCommand == EWmlCmdHistory ) || |
249 ( aCommand == EWmlCmdGoToAddress ) || |
249 ( aCommand == EWmlCmdGoToAddress ) || |
250 ( aCommand == EWmlCmdShowShortcutKeymap ) || |
250 ( aCommand == EWmlCmdShowShortcutKeymap ) || |
251 ( aCommand == EWmlCmdShowMiniature ) ) ) |
251 ( aCommand == EWmlCmdShowMiniature )|| |
|
252 ( aCommand == EWmlCmdShowToolBar)) ) |
252 { |
253 { |
253 iWasContentFullScreenMode = iContentFullScreenMode; |
254 iWasContentFullScreenMode = iContentFullScreenMode; |
254 EnableFullScreenModeL( EFalse ); |
255 EnableFullScreenModeL( EFalse ); |
255 } |
256 } |
256 |
257 |
3157 if ( Layout_Meta_Data::IsLandscapeOrientation() ) |
3158 if ( Layout_Meta_Data::IsLandscapeOrientation() ) |
3158 StatusPane()->SwitchLayoutL(R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS); |
3159 StatusPane()->SwitchLayoutL(R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS); |
3159 #endif |
3160 #endif |
3160 StatusPane()->MakeVisible( ETrue ); |
3161 StatusPane()->MakeVisible( ETrue ); |
3161 iContainer->SetRect(ClientRect()); |
3162 iContainer->SetRect(ClientRect()); |
|
3163 // Remove any timer that has already been set |
|
3164 if ( iPeriodic ) |
|
3165 { |
|
3166 iPeriodic->Cancel(); |
|
3167 } |
3162 } |
3168 } |
3163 else |
3169 else |
3164 { |
3170 { |
3165 // Kick off timer for 3 seconds before hiding status pane again |
3171 // Kick off timer for 3 seconds before hiding status pane again |
3166 if ( iPeriodic ) |
3172 if ( iPeriodic ) |