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

equal deleted inserted replaced

-:a949c2543c15
+:ea672fcb0ea0
 // System includes
 #include <hbgridview.h>
 #include <hbabstractviewitem.h>
 #include <hbstyleloader.h>
 #include <hbcolorscheme.h>
+#include <hbpangesture.h>
+#include <hbswipegesture.h>
 // User includes
 #include "calenmonthgrid.h"
 #include "calengriditemprototype.h"
 #include "calenmonthdata.h"
 #include "calenmonthview.h"
 #include "calendateutils.h"
 #include "calencommon.h"
 // Constants
-#define SCROLL_SPEEED 2000
+#define SCROLL_SPEEED 3000
 #define GRIDLINE_WIDTH 0.075 //units
 /*!
 \class CalenMonthGrid
 	mModel(0),
 	mDirection(invalid),
 	mIsPanGesture(false),
 	mIsAtomicScroll(true),
 	mView(NULL),
-	mCurrentRow(0),
+	mCurrentRow(-100),
 	mIsNonActiveDayFocused(false),
 	mIgnoreItemActivated(false),
 	mGridBorderColor(Qt::gray)
 {
 	setScrollDirections(Qt::Vertical);
 	setSelectionMode(HbGridView::NoSelection);
 	setUniformItemSizes(true);
 	setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 	setClampingStyle(HbScrollArea::StrictClamping);
 	setEnabledAnimations(HbAbstractItemView::None);
+	setFrictionEnabled(false);
 	resetTransform();
 	// Get the content widget of the scroll area to draw the grid lines
 	mContentWidget = contentWidget();
 	}
 	// Connect to scrolling finished signal
 	connect(this, SIGNAL(scrollingEnded()), this,
 			SLOT(scrollingFinished()));
-	// Connect to item activated signal
-	connect(this, SIGNAL(activated(const QModelIndex &)), this,
-				SLOT(itemActivated(const QModelIndex &)));
 }
 /*!
 Destructor
 */
 	itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
 								   KCalenDaysInWeek) - 1;
 	indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
 	mIsAtomicScroll = true;
 	scrollTo(indexToBeScrolled);
+	// Update the sart position of the content widget
+	mStartPos = mContentWidget->pos();
+	// Now connect to the signal which gets emitted when any item on the grid
+	// is tapped.
+	connect(this, SIGNAL(activated(const QModelIndex &)), this,
+						SLOT(itemActivated(const QModelIndex &)));
 }
 /*!
 	Updates the view with just event indicators
 */
 		}
 	}
 }
 /*!
-Listens for down gesture
+Scrolls the content dowmwards
 */
-void CalenMonthGrid::downGesture (int value)
+void CalenMonthGrid::downGesture()
 {
-	Q_UNUSED(value)
+mDirection = down;
-	mDirection = down;
+mIsAtomicScroll = false;
-	mIsAtomicScroll = false;
+setAttribute(Hb::InteractionDisabled);
-	setAttribute(Hb::InteractionDisabled);
+QPointF targetPos(0.0, 0.0);
+scrollContentsTo(targetPos,500);
-	// pass it to parent
+}
-	HbScrollArea::downGesture(value);
-}
+/*!
+Scrolls the content upwards
-/*!
+*/
-Listens for Up gesture
+void CalenMonthGrid::upGesture()
-*/
+{
-void CalenMonthGrid::upGesture (int value)
+mDirection = up;
-{
+mIsAtomicScroll = false;
-	Q_UNUSED(value)
+setAttribute(Hb::InteractionDisabled);
-	mDirection = up;
+QPointF targetPos(0.0, mStartPos.y() - size().height());
-	mIsAtomicScroll = false;
+scrollContentsTo(-targetPos,500);
-	setAttribute(Hb::InteractionDisabled);
-	// pass it to parent
-	HbScrollArea::upGesture(value);
 }
 /*!
 Function to listen mouse press events
 */
 void CalenMonthGrid::mousePressEvent(QGraphicsSceneMouseEvent* event)
 {
-	mPressedPos = event->pos();
 	// Pass it to parent
 	HbGridView::mousePressEvent(event);
 }
 /*!
 Function to listen mouse release events
 */
 void CalenMonthGrid::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
 {
-	int posDiff = mPressedPos.y() - event->pos().y();
+	// Pass it grid view if pan gesture is not in progress else pass it to
-	if (posDiff < -50) {
+	// scrollarea. Problem here is, if we pass to gridview when panning, then
-		mDirection = down;
+	// its emitting item activated signal simply becasue of which focus item
-	} else if (posDiff > 50){
+	// is getting changed when you finish the pan / shake
-		mDirection = up;
-	}
-	// Pass it to parent
-	HbGridView::mouseReleaseEvent(event);
-}
-/*!
-Listens for pan gesture
-*/
-void  CalenMonthGrid::panGesture(const QPointF &  delta)
-{
-	setAttribute(Hb::InteractionDisabled);
-	mIsAtomicScroll = false;
 	if (!mIsPanGesture) {
-		mIsPanGesture = true;
+		HbGridView::mouseReleaseEvent(event);
-		mIgnoreItemActivated = true;
+	} else {
-		mStartPos = mContentWidget->pos();
+		HbScrollArea::mouseReleaseEvent(event);
-		// Get to know the direction of the gesture
+	}
-		if (delta.y() > 0) {
+}
-			mDirection = down;
-		} else {
+/*!
-			mDirection = up;
+Function to list for all the gesture events
-		}
+*/
-	}
+void CalenMonthGrid::gestureEvent(QGestureEvent *event)
+{
-	// Call the parent class to perform the pan gesture
+if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
-	// When scrolling finished, month grid will adjust to show the proper month
+if (gesture->state() == Qt::GestureStarted) {
-	HbScrollArea::panGesture(delta);
+setAttribute(Hb::InteractionDisabled);
+mIsAtomicScroll = false;
+if (!mIsPanGesture) {
+mIsPanGesture = true;
+mIgnoreItemActivated = true;
+mStartPos = mContentWidget->pos();
+// Get to know the direction of the gesture
+QPointF velocity = gesture->velocity();
+if (velocity.y() > 0) {
+mDirection = down;
+} else {
+mDirection = up;
+}
+}
+} else if(gesture->state() == Qt::GestureFinished) {
+		// TODO: Need to handle here to avoid followOn animation
+}
+} else if(HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
+if (gesture->state() == Qt::GestureStarted) {
+setAttribute(Hb::InteractionDisabled);
+mIsAtomicScroll = false;
+if (gesture->swipeAngle() > 250 && gesture->swipeAngle() < 290 &&
+gesture->verticalDirection() == QSwipeGesture::Down) {
+mDirection = down;
+} else if (gesture->swipeAngle() > 70 && gesture->swipeAngle() < 110 &&
+gesture->verticalDirection() == QSwipeGesture::Up) {
+mDirection = up;
+}
+}
+gesture->setSpeed(SCROLL_SPEEED);
+}
+// Call the parent class to perform the pan gesture
+// When scrolling finished, month grid will adjust to show the proper month
+HbScrollArea::gestureEvent(event);
 }
 /*!
 Gets called when scrolling finishes to update the model
 */
 void CalenMonthGrid::scrollingFinished()
 {
 	if (mIsPanGesture) {
 		handlePanGestureFinished();
 	} else if(!mIsAtomicScroll) {
 		QDateTime activeDate = mView->getActiveDay();
 		if(mDirection == down) { // down gesture
 		// more than or equal to half of the future month
 		if (date.date().day() > (activeMonth.date().daysInMonth()) / 2 ||
 				date.addDays(KNumOfVisibleRows*KCalenDaysInWeek).date().day() >=
 				(prevMonth.date().daysInMonth()) / 2) {
 			// up gesture to bring the next month
-			upGesture(SCROLL_SPEEED);
+			upGesture();
 		} else {
 			// we should again show the current month by scrolling downwards
 			mDirection = down;
 			mIsAtomicScroll = true;
+			setAttribute(Hb::InteractionDisabled);
 			scrollContentsTo(-mStartPos,500);
 		}
 	} else if (month == prevMonth.date().month()) {
 		// first visible item belongs to previous month
 		// Check if the date is more than half of the previous month
 		if (date.date().day() > (prevMonth.date().daysInMonth()) / 2) {
 			// we should again show the current month by scrolling upwards
 			mDirection = up;
 			mIsAtomicScroll = true;
+			setAttribute(Hb::InteractionDisabled);
 			scrollContentsTo(-mStartPos,500);
 		} else {
 			// down gesture to show the previous month
-			downGesture(SCROLL_SPEEED);
+			downGesture();
 		}
+	} else if (month == prevMonth.addMonths(-1).date().month()) {
+		// first visible date belong to previous to previous month
+		// hence, scroll down to bring the previous month
+		downGesture();
 	} else if (month == nextMonth.date().month()) {
 		// first visible item belongs to next month
 		// Check if the date is more than half of the next month
 		if (date.date().day() > (nextMonth.date().daysInMonth()) / 2) {
 			// up gesture to bring the next month
-			upGesture(SCROLL_SPEEED);
+			upGesture();
 		} else {
 			// we should again show the current month by scrolling upwards
 			mDirection = invalid;
+			setAttribute(Hb::InteractionDisabled);
 			scrollContentsTo(-mStartPos,500);
 		}
+	} else if (month == nextMonth.addMonths(1).date().month()) {
+		// first visible date belongs to next to next month
+		// hence, scroll up to show the next month
+		upGesture();
 	}
 }
 /*!
 Called when down gesture is performed. Adds the new previous month details
 	indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
 	mIsAtomicScroll = true;
 	scrollTo(indexToBeScrolled);
 	// Update the mCurrentRow
 	mCurrentRow += countToBeAdded;
+	// Update the sart position of the content widget
+	mStartPos = mContentWidget->pos();
 }
 /*!
 	Helper function that prepends the required rows to the model
 */
 	itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
 									   KCalenDaysInWeek) - 1;
 	indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
 	mIsAtomicScroll = true;
 	scrollTo(indexToBeScrolled);
+	// Update the sart position of the content widget
+mStartPos = mContentWidget->pos();
 }
 /*!
 	Helper function that appends the required rows to the model
 */
 		// Launch the agenda view
 		mView->launchDayView();
 	} else {
 		// Reset the focus attribute to this item
 		QModelIndex itemIndex = mModel->index(mCurrentRow,0);
+		if(itemIndex.row() < 0 || itemIndex.row() >= mModel->rowCount() ||
+				itemIndex.column() < 0 || itemIndex.column() > mModel->columnCount()) {
+			return;
+		}
 		QVariant itemData = itemIndex.data(Qt::UserRole + 1);
 		QVariantList list = itemData.toList();
 		list.replace(CalendarNamespace::CalendarMonthFocusRole, false);
 		mModel->itemFromIndex(itemIndex)->setData(list);
 			activeMonth = activeMonth.addMonths(1);
 			if (activeMonth.date().month() ==
 				mNonActiveFocusedDay.date().month()) {
 				mDirection = up;
 				// up gesture
-				upGesture(SCROLL_SPEEED);
+				upGesture();
 				setActiveDates(activeMonth.date());
 			} else {
 				mDirection = down;
 				// down gesture
-				downGesture(SCROLL_SPEEED);
+				downGesture();
 				setActiveDates(activeMonth.addMonths(-2).date());
 			}
 		}
 		mView->setContextForActiveDay(index.row());
 	}

changeset 32	ea672fcb0ea0
parent 26	a949c2543c15
child 37	360d55486d7f