equal
deleted
inserted
replaced
135 iWasContentFullScreenMode( EFalse ) |
135 iWasContentFullScreenMode( EFalse ) |
136 { |
136 { |
137 iFindItemIsInProgress = EFalse; |
137 iFindItemIsInProgress = EFalse; |
138 iWasInFeedsView = EFalse; |
138 iWasInFeedsView = EFalse; |
139 iPenEnabled = AknLayoutUtils::PenEnabled(); |
139 iPenEnabled = AknLayoutUtils::PenEnabled(); |
|
140 iFullScreenBeforeEditModeEntry = EFalse; |
140 } |
141 } |
141 |
142 |
142 |
143 |
143 // ----------------------------------------------------------------------------- |
144 // ----------------------------------------------------------------------------- |
144 // CBrowserContentView::Id |
145 // CBrowserContentView::Id |
976 |
977 |
977 if (iPenEnabled) |
978 if (iPenEnabled) |
978 { |
979 { |
979 StartAutoFullScreenTimer(); |
980 StartAutoFullScreenTimer(); |
980 } |
981 } |
|
982 iContainer->SetRect(ClientRect()); |
981 PERFLOG_STOP_WRITE("ContentView::DoActivate") |
983 PERFLOG_STOP_WRITE("ContentView::DoActivate") |
982 } |
984 } |
983 |
985 |
984 |
986 |
985 // ----------------------------------------------------------------------------- |
987 // ----------------------------------------------------------------------------- |
2276 } |
2278 } |
2277 break; |
2279 break; |
2278 } |
2280 } |
2279 case TBrCtlDefs::EStateFullscreenBrowsing: |
2281 case TBrCtlDefs::EStateFullscreenBrowsing: |
2280 { |
2282 { |
2281 if ( !aValue ) |
2283 if (!iPenEnabled && IsEditMode()) |
2282 { |
2284 { |
2283 TRAP_IGNORE( EnableFullScreenModeL( EFalse ) ); |
2285 if (!aValue) |
|
2286 { // exit fullscreen so remember what to go back to after edit mode is exited |
|
2287 iFullScreenBeforeEditModeEntry = iContentFullScreenMode; |
|
2288 TRAP_IGNORE( EnableFullScreenModeL( EFalse ) ); |
|
2289 } |
|
2290 else if (aValue && iFullScreenBeforeEditModeEntry) |
|
2291 { |
|
2292 TRAP_IGNORE( EnableFullScreenModeL( ETrue ) ); |
|
2293 } |
|
2294 } |
|
2295 else if (!aValue) |
|
2296 { |
|
2297 TRAP_IGNORE( EnableFullScreenModeL( EFalse ) ); |
2284 } |
2298 } |
2285 break; |
2299 break; |
2286 } |
2300 } |
2287 case TBrCtlDefs::EStateHistoryBeginning: |
2301 case TBrCtlDefs::EStateHistoryBeginning: |
2288 { |
2302 { |
2917 // --------------------------------------------------------------------------- |
2931 // --------------------------------------------------------------------------- |
2918 // FindCurrentZoomIndex |
2932 // FindCurrentZoomIndex |
2919 // --------------------------------------------------------------------------- |
2933 // --------------------------------------------------------------------------- |
2920 TInt CBrowserContentView::FindCurrentZoomIndex(TInt aCurrentZoomLevel) |
2934 TInt CBrowserContentView::FindCurrentZoomIndex(TInt aCurrentZoomLevel) |
2921 { |
2935 { |
2922 TInt aIndex = -1; |
2936 TInt index = -1; |
2923 |
2937 for ( index = 0; index<iZoomLevelArray->Count()-1; index++) |
2924 for (aIndex=0; aIndex<iZoomLevelArray->Count()-1; aIndex++) |
2938 { |
2925 { |
2939 if (aCurrentZoomLevel <=(*iZoomLevelArray)[index] ) |
2926 TInt tmpZoomLevel = (*iZoomLevelArray)[aIndex]; |
2940 { |
2927 if (aCurrentZoomLevel ==(*iZoomLevelArray)[aIndex] ) |
2941 break; |
2928 { |
2942 } |
2929 break; |
2943 } |
2930 } |
2944 return index; |
2931 } |
|
2932 return aIndex; |
|
2933 } |
2945 } |
2934 |
2946 |
2935 // --------------------------------------------------------------------------- |
2947 // --------------------------------------------------------------------------- |
2936 // CBrowserContentView::SetZoomLevelTitleTextL |
2948 // CBrowserContentView::SetZoomLevelTitleTextL |
2937 // --------------------------------------------------------------------------- |
2949 // --------------------------------------------------------------------------- |
3324 TBool CBrowserContentView::IsEditMode() |
3336 TBool CBrowserContentView::IsEditMode() |
3325 { |
3337 { |
3326 TBrCtlDefs::TBrCtlElementType focusedElementType = |
3338 TBrCtlDefs::TBrCtlElementType focusedElementType = |
3327 ApiProvider().BrCtlInterface().FocusedElementType(); |
3339 ApiProvider().BrCtlInterface().FocusedElementType(); |
3328 |
3340 |
3329 return (focusedElementType == TBrCtlDefs:: EElementActivatedInputBox); |
3341 TBool retVal = ((focusedElementType == TBrCtlDefs:: EElementActivatedInputBox) || |
|
3342 (focusedElementType == TBrCtlDefs:: EElementInputBox) || |
|
3343 (focusedElementType == TBrCtlDefs:: EElementTextAreaBox)); |
|
3344 return (retVal); |
3330 } |
3345 } |
3331 |
3346 |
3332 // End of File |
3347 // End of File |