[commit] r1720 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Dec  2 12:12:36 2011
New Revision: 1720

Log:
Fix Panning Window refresh on eg drag-n-drop with parent model open. Fix OnDrop: ResetParent needs a tx

Modified:
   trunk/GME/Gme/GMEView.cpp

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Thu Dec  1 12:37:33 2011	(r1719)
+++ trunk/GME/Gme/GMEView.cpp	Fri Dec  2 12:12:36 2011	(r1720)
@@ -688,7 +688,7 @@
 //	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
 	CMainFrame* main = (CMainFrame*)theApp.m_pMainWnd;
 
-	if (!main || !main->m_panningWindow.IsVisible())
+	if (!main || !main->m_panningWindow.IsVisible() || CGMEView::GetActiveView() != this)
 		return;
 
 	// the original size of the image
@@ -6146,8 +6146,8 @@
 				CPoint diff = point - CPoint(left,top);
 				CGuiObject::ShiftModels(selected, diff);
 				CGuiAnnotator::ShiftAnnotations(selectedAnnotations,diff);
-				CommitTransaction();
 				ResetParent();
+				CommitTransaction();
 			}
 			catch(hresult_exception e) {                
 				AbortTransaction(e.hr);