FCL/sf/app/organizer: comparison calendarui/views/src/calenmonthgrid.cpp

equal deleted inserted replaced

-:0b38fc5b94c6
+:2c54b51f39c4
 #include <hbcolorscheme.h>
 #include <hbpangesture.h>
 #include <hbswipegesture.h>
 #include <hbtapgesture.h>
 #include <hbdeviceprofile.h>
+#include <hbinstance.h>
 // User includes
 #include "calenmonthgrid.h"
 #include "calengriditemprototype.h"
 #include "calenmonthdata.h"
 		// Calculate the last visible item in the grid
 		QModelIndex lastVisibleIndex = mModel->index(indexToBeScrolled, 0);
 		scrollTo(lastVisibleIndex);
 	}
-	mMonthDataArray = monthDataArray;
 	OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT );
 }
 /*!
 */
 void CalenMonthGrid::updateMonthGridWithInActiveMonths(
 										QList<CalenMonthData> &monthDataArray)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_ENTRY );
-	mMonthDataArray = monthDataArray;
 	// Prepend the required rows
 	handlePrependingRows(monthDataArray);
 	// Append the required rows
 void CalenMonthGrid::updateMonthGridWithEventIndicators(
 										QList<CalenMonthData> &monthDataArray)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_ENTRY );
-	mMonthDataArray = monthDataArray;
 	int count(monthDataArray.count());
 	for(int i = 0; i < count; i++) {
 		// Check if the day has events
 		if (monthDataArray[i].HasEvents()) {
 			QModelIndex itemIndex = mModel->index(i,0);
 // Get to know the direction of the gesture
 // Use our defined threshold temporarily till scrollarea
 // frm orbit side is made clever enough not to scroll in other direction
 // apart frm the registered scroll direction
 QPointF delta = gesture->delta();
-if (abs(delta.x()) > MAX_PAN_DIRECTION_THRESHOLD) {
+// Check the current orientation of the device and
+// swap the vertical and horizontal distances in landscape
+qreal horizontalDiff = 0.0;
+qreal verticalDiff = 0.0;
+if (hbInstance->allMainWindows().at(0)->orientation() == Qt::Vertical) {
+horizontalDiff = delta.x();
+verticalDiff = delta.y();
+} else {
+horizontalDiff = delta.y();
+verticalDiff = delta.x();
+}
+if (abs(horizontalDiff) > MAX_PAN_DIRECTION_THRESHOLD) {
 // Now see if y coord diff has crossed threshold
-if (delta.y() > MAX_PAN_DIRECTION_THRESHOLD) {
+if (verticalDiff > MAX_PAN_DIRECTION_THRESHOLD) {
 mIsPanGesture = true;
 mIgnoreItemActivated = true;
 mDirection = down;
-} else if (delta.y() < -MAX_PAN_DIRECTION_THRESHOLD){
+} else if (verticalDiff < -MAX_PAN_DIRECTION_THRESHOLD){
 mIsPanGesture = true;
 mIgnoreItemActivated = true;
 mDirection = up;
 } else {
 event->accept(Qt::PanGesture);
 OstTraceFunctionExit0( CALENMONTHGRID_GESTUREEVENT_EXIT );
 return;
 }
-} else if (abs(delta.x()) < MAX_PAN_DIRECTION_THRESHOLD) {
+} else if (abs(horizontalDiff) < MAX_PAN_DIRECTION_THRESHOLD) {
-if (delta.y() > MIN_PAN_DIRECTION_THRESHOLD) {
+if (verticalDiff > MIN_PAN_DIRECTION_THRESHOLD) {
 mIsPanGesture = true;
 mIgnoreItemActivated = true;
 mDirection = down;
-} else if (delta.y() < -MIN_PAN_DIRECTION_THRESHOLD){
+} else if (verticalDiff < -MIN_PAN_DIRECTION_THRESHOLD){
 mIsPanGesture = true;
 mIgnoreItemActivated = true;
 mDirection = up;
 }else {
 event->accept(Qt::PanGesture);
 	QList<HbAbstractViewItem *> list = visibleItems();
 	HbAbstractViewItem* item = list[0];
 	QModelIndex modelIndex = item->modelIndex();
 	// Get the date which is visible at the above row
-	QDateTime date = mMonthDataArray[modelIndex.row()].Day();
+	QList<CalenMonthData>& monthDataArray = mView->monthDataList();
+	QDateTime date = monthDataArray[modelIndex.row()].Day();
 	// Check if this date belong to current active month or
 	// previous month else future month
 	QDateTime activeMonth = mView->getActiveDay();
 	QDateTime prevMonth = activeMonth.addMonths(-1);
 	int deleteFromIndex = (rowsInPrevMonthEarlier + KNumOfVisibleRows) * KCalenDaysInWeek;
 	int numOfIndices = rowsInFutMonthEarlier * KCalenDaysInWeek;
 	// Get the updated dates from the view
 	mView->updateModelWithPrevMonth();
-	QList<CalenMonthData > monthDataList = mView->monthDataList();
+	QList<CalenMonthData >& monthDataList = mView->monthDataList();
-	mMonthDataArray = monthDataList;
 	// Prepend the required rows
 	handlePrependingRows(monthDataList);
 	// Since, we have finished setData, Now unblock the signals
 	// remove the cells in the previous month
 	int countToBeDeleted = rowsInPrevMonth * KCalenDaysInWeek;
 	// Get the updated dates from the view
 	mView->updateModelWithFutureMonth();
-	QList<CalenMonthData > monthDataList = mView->monthDataList();
+	QList<CalenMonthData >& monthDataList = mView->monthDataList();
-	mMonthDataArray = monthDataList;
 	// Get the model count before we add any rows into the mode
 	int rowCount = mModel->rowCount();
 	// Append the required rows
 	handleAppendingRows(monthDataList);
 								 true);
 		mModel->itemFromIndex(itemIndex)->setData(list);
 		// Check if inactive date is tapped
 		QDateTime activeMonth = mView->getActiveDay();
 		int month = activeMonth.date().month();
-		if(month != mMonthDataArray[mCurrentRow].Day().date().month()){
+		QList<CalenMonthData >& monthDataList = mView->monthDataList();
+		if(month != monthDataList[mCurrentRow].Day().date().month()){
 			// Set the flag
 			mIsNonActiveDayFocused = true;
-			mNonActiveFocusedDay = mMonthDataArray[mCurrentRow].Day();
+			mNonActiveFocusedDay = monthDataList[mCurrentRow].Day();
 			// Add one month to active month
 			activeMonth = activeMonth.addMonths(1);
 			if (activeMonth.date().month() ==
 				mNonActiveFocusedDay.date().month()) {
 	// set active date color only for the dates that fall in current month
 	// So, in the whole data array, start from where the current month starts
 	// and stop the loop where it the current month ends
 	int start = 0;
-	int end = mMonthDataArray.count();
+	QList<CalenMonthData >& monthDataList = mView->monthDataList();
+	int end = monthDataList.count();
 	// Calculate the start and end values
 	QDate firstDateInGrid = mView->firstDayOfGrid().date();
 	// Get the date where active month starts

changeset 55	2c54b51f39c4
parent 51	0b38fc5b94c6
child 57	bb2d3e476f29