--- a/webengine/webkitutils/HistoryProvider/HistoryController.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/webkitutils/HistoryProvider/HistoryController.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -18,12 +18,11 @@
// INCLUDE FILES
#include <../bidi.h>
-#include <brctldialogsprovider.h>
-
#include "HistoryController.h"
-#include <brctldefs.h>
+#include "BrCtlDefs.h"
#include "HistoryView.h"
#include "HistoryEntry.h"
+#include "BrCtlDialogsProvider.h"
// EXTERNAL DATA STRUCTURES
@@ -152,10 +151,7 @@
CleanupStack::PushL( pageInfo );
return pageInfo;
}
-void HistoryController::rollBackIndex()
- {
- m_currentIndex = m_tempCurrentIndex;
- }
+
/**
*/
void HistoryController::handleHistoryCommandL(int command)
@@ -172,7 +168,7 @@
case TBrCtlDefs::ECommandBack:
{
if (m_historyViewEnabled && m_backListAllowed) {
- showHistoryViewL(false);
+ showHistoryViewL(true);
}
else {
loadHistoryUrl( EHistoryStackDirectionPrevious, TBrCtlDefs::ECacheModeHistory, -1);
@@ -258,9 +254,6 @@
HistoryEntry* entry = entryByIndex(m_currentIndex);
if (entry) {
TSize bmsize = bitmap->SizeInPixels();
-#ifdef BRDO_MULTITOUCH_ENABLED_FF
- entry->storeThumbnail(bitmap, TRect(0,0,bmsize.iWidth, bmsize.iHeight));
-#else
TRect parentControlRect = m_historyCallback->parent()->Rect();
int historyViewWidth = parentControlRect.Width();
int historyViewHeight( parentControlRect.Height());
@@ -268,8 +261,7 @@
int maxDimension = (historyViewWidth > historyViewHeight)? historyViewWidth:historyViewHeight;
int thumbnailHeight = Min(bmsize.iHeight, maxDimension*KCenterThumbnailHeightPercent/100);
int thumbnailWidth = Min(bmsize.iWidth, maxDimension*KCenterThumbnailWidthPercent/100);
- entry->storeThumbnail(bitmap, TRect(0,0,thumbnailWidth, thumbnailHeight));
-#endif
+ entry->storeThumbnail(bitmap, TRect(0,0,thumbnailWidth, thumbnailHeight));
}
}
}
@@ -525,11 +517,8 @@
SelectArray* historyList = new( ELeave ) CArrayFixFlat<TBrCtlSelectOptionData>(10);
CleanupStack::PushL( historyList );
for( int i = m_historyStack.Count() - 1; i >= 0; i-- ) {
- if(entryByIndex(i))
- {
- TBrCtlSelectOptionData t( TBrCtlSelectOptionData(entryByIndex(i)->pageTitle(), i == m_currentIndex, false, false) );
- historyList->AppendL(t);
- }
+ TBrCtlSelectOptionData t( TBrCtlSelectOptionData(entryByIndex(i)->pageTitle(), i == m_currentIndex, false, false) );
+ historyList->AppendL(t);
}
// Display history dialog
bool ret = m_historyCallback->dialogSelectOption(historyList);