equal
deleted
inserted
replaced
40 |
40 |
41 #include <AiwMenu.h> |
41 #include <AiwMenu.h> |
42 #include <AiwCommon.h> |
42 #include <AiwCommon.h> |
43 #include <AiwServiceHandler.h> |
43 #include <AiwServiceHandler.h> |
44 #include <AknGlobalNote.h> |
44 #include <AknGlobalNote.h> |
45 TInt CCSXHHtmlTopicView::iFontSize = TBrCtlDefs::EFontSizeLevelNormal; |
45 TInt CCSXHHtmlTopicView::iFontSize = TBrCtlDefs::EFontSizeLevelLarger; |
46 |
46 |
47 CCSXHHtmlTopicView* CCSXHHtmlTopicView::NewL(const TUid& aUid, const TInt& aFlags,const |
47 CCSXHHtmlTopicView* CCSXHHtmlTopicView::NewL(const TUid& aUid, const TInt& aFlags,const |
48 TRect& aRect) |
48 TRect& aRect) |
49 { |
49 { |
50 CCSXHHtmlTopicView* temp = new(ELeave) CCSXHHtmlTopicView(aUid,aFlags); |
50 CCSXHHtmlTopicView* temp = new(ELeave) CCSXHHtmlTopicView(aUid,aFlags); |
251 { |
251 { |
252 if(iBCContainer) |
252 if(iBCContainer) |
253 { |
253 { |
254 iBCContainer->MakeVisible(EFalse); |
254 iBCContainer->MakeVisible(EFalse); |
255 TRAP_IGNORE(iBCContainer->CancelFetchL()); |
255 TRAP_IGNORE(iBCContainer->CancelFetchL()); |
|
256 // FEP causes crash if it still hold the observer. |
|
257 // fix as FEP suggested. |
|
258 iBCContainer->SetFocus( EFalse ); |
256 AppUi()->RemoveFromStack(iBCContainer); |
259 AppUi()->RemoveFromStack(iBCContainer); |
257 } |
260 } |
258 } |
261 } |
259 // -------------------------------------------------------------------------- |
262 // -------------------------------------------------------------------------- |
260 // When a view which was previously activated, goes to background and gets |
263 // When a view which was previously activated, goes to background and gets |
304 |
307 |
305 if( R_CSXH_MENU_HTMLTOPICVIEW == aResourceId) |
308 if( R_CSXH_MENU_HTMLTOPICVIEW == aResourceId) |
306 { |
309 { |
307 TInt CurrentFontSize = iBCContainer->GetCurrentValueL(TBrCtlDefs::ESettingsFontSize); |
310 TInt CurrentFontSize = iBCContainer->GetCurrentValueL(TBrCtlDefs::ESettingsFontSize); |
308 |
311 |
309 if(CurrentFontSize == TBrCtlDefs::EFontSizeLevelAllSmall) |
312 if(CurrentFontSize == TBrCtlDefs::EFontSizeLevelNormal) |
310 { |
313 { |
311 aMenuPane->SetItemDimmed(ECsHelpCmdFontSmall,ETrue); |
314 aMenuPane->SetItemDimmed(ECsHelpCmdFontSmall,ETrue); |
312 } |
315 } |
313 else if(CurrentFontSize == TBrCtlDefs::EFontSizeLevelAllLarge) |
316 else if(CurrentFontSize == TBrCtlDefs::EFontSizeLevelAllLarge) |
314 { |
317 { |