--- a/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp Fri Jun 25 19:19:22 2010 +0300
+++ b/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp Fri Jul 09 14:36:01 2010 +0300
@@ -63,7 +63,7 @@
mRectLieLeft(false), mTopInRange(false), mBottomInRange(false),
mMinHorizontalEdgesDistance(0.0), mHorizontalDistance(0.0),
mHorizontalDistanceFromSelectedRect(0.0), mContainerHorizontalEdgeDistance(0.0),
- mSnapEnabled(false), mSnapForce(0.0), mSnapGap(0.0), mSnapBorderGap(0.0),
+ mSnapEnabled(false), mSnapForce(0.0), mSnapGap(0.0),
mRectVerticalEdgeLiesInLineWithVerticalLine(false), mRectLieAboveVerticalLine(false), mRectLieBelowVerticalLine(false),
mRectHorizontalEdgeLiesInLineWithHorizontalLine(false), mRectLieLeftOfHorizontalLine(false), mRectLiesRightOfHorizontalLine(false)
{
@@ -80,7 +80,6 @@
//The following values should be in qreal, so the status received in canConvert is ignored
mSnapForce = configuration[SNAPFORCE].toDouble(&canConvert);
mSnapGap = configuration[SNAPGAP].toDouble(&canConvert);
- mSnapBorderGap = configuration[SNAPBORDERGAP].toDouble(&canConvert);
}
/*!
@@ -91,11 +90,7 @@
const QList<QRectF> &inactiveRects,
const QRectF &activeRect)
{
- mContainerRect.setLeft(containerRect.left() + mSnapBorderGap);
- mContainerRect.setTop(containerRect.top() + mSnapBorderGap);
- mContainerRect.setRight(containerRect.right() - mSnapBorderGap);
- mContainerRect.setBottom(containerRect.bottom() - mSnapBorderGap);
-
+ mContainerRect = containerRect;
mActiveRectWidth = activeRect.width();
mActiveRectHeight = activeRect.height();