--- a/idlehomescreen/xmluirendering/uiengine/src/xneditmode.cpp Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/xmluirendering/uiengine/src/xneditmode.cpp Mon Jan 18 20:10:36 2010 +0200
@@ -115,12 +115,12 @@
{
CXnUiEngine* engine( aNode.UiEngine() );
- CXnDomStringPool& sp( aNode.DomNode()->StringPool() );
+ CXnDomStringPool* sp( aNode.DomNode()->StringPool() );
CXnProperty* prop = CXnProperty::NewL(
XnPropertyNames::style::common::KVisibility,
aVisibility,
- CXnDomPropertyValue::EString, sp );
+ CXnDomPropertyValue::EString, *sp );
CleanupStack::PushL( prop );
aNode.SetPropertyL( prop );
@@ -303,7 +303,7 @@
DrawNow( iLastDrawRect );
}
- iDrawPos = TPoint::EUninitialized;
+ iDrawPos.SetXY( 0, 0 );
iLastDrawRect = TRect::EUninitialized;
}
}
@@ -459,9 +459,9 @@
if ( iState == CXnEditMode::EDragging )
{
node->SetStateL( XnPropertyNames::style::common::KFocus );
- #ifdef RD_TACTILE_FEEDBACK
- Feedback( ETouchFeedbackSensitive );
- #endif
+#ifdef RD_TACTILE_FEEDBACK
+ Feedback( ETouchFeedbackSensitive );
+#endif
}
else if ( iDraggingNode &&
!iDraggingNode->MarginRect().Contains( aPointerEvent.iPosition ) )
@@ -540,7 +540,10 @@
}
}
else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
- {
+ {
+#ifdef RD_TACTILE_FEEDBACK
+ Feedback( ETouchFeedbackBasic );
+#endif
// Cancel
if ( !iTargetNode || !iDraggingNode ||
iDraggingNode == iTargetNode ||
@@ -754,10 +757,12 @@
iDraggingNode->Parent()->SetDirtyL( XnDirtyLevel::ELayoutAndRender );
}
- iDraggingNode = iTargetNode = NULL;
-
- iPreviousPos = iStylusDownPos = TPoint::EUninitialized;
-
+ iDraggingNode = NULL;
+ iTargetNode = NULL;
+
+ iPreviousPos.SetXY( 0, 0 );
+ iStylusDownPos.SetXY( 0, 0 );
+
iState = CXnEditMode::EDragAndDrop;
}