r18041 by fschmid - Partly fixed Bug #11327: Changing inline frame dimensions produces unexpected results

[scribus-commit]

Author: fschmid
Date: Thu Jan  3 17:26:32 2013
New Revision: 18041

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18041
Log:
Partly fixed Bug #11327: Changing inline frame dimensions produces unexpected results

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18041&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Jan  3 17:26:32 2013
@@ -8847,6 +8847,10 @@
 			doc->autoSaveTimer->stop();
 			doc->setAutoSave(false);
 		}
+		if (doc->m_Selection->count() == 1)
+			doc->currentEditedTextframe = doc->m_Selection->itemAt(0);
+		else
+			doc->currentEditedTextframe = NULL;
 		view->Deselect(true);
 		storedPageNum = doc->currentPageNumber();
 		storedViewXCoor = view->contentsX();
@@ -8952,6 +8956,9 @@
 	view->setScale(storedViewScale);
 	doc->setCurrentPage(doc->DocPages.at(storedPageNum));
 	view->setContentsPos(static_cast<int>(storedViewXCoor * storedViewScale), static_cast<int>(storedViewYCoor * storedViewScale));
+	if (doc->currentEditedTextframe != NULL)
+		doc->currentEditedTextframe->invalidateLayout();
+	doc->currentEditedTextframe = NULL;
 	view->DrawNew();
 	pagePalette->Rebuild();
 	propertiesPalette->updateColorList();

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18041&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Jan  3 17:26:32 2013
@@ -292,6 +292,7 @@
 	editOnPreview = false;
 	previewVisual = -1;
 	dontResize = false;
+	currentEditedTextframe = NULL;
 }
 
 
@@ -399,6 +400,7 @@
 	editOnPreview = false;
 	previewVisual = -1;
 	dontResize = false;
+	currentEditedTextframe = NULL;
 }
 
 
@@ -6783,6 +6785,8 @@
 		maxy = qMax(maxy, y2);
 		currItem->gXpos = currItem->xPos() - minx;
 		currItem->gYpos = currItem->yPos() - miny;
+		currItem->gWidth = maxx - minx;
+		currItem->gHeight = maxy - miny;
 		currItem->setXYPos(currItem->gXpos, currItem->gYpos, true);
 		currItem->isEmbedded = true;
 		currItem->inlineCharID = currentEditedIFrame;

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18041&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Thu Jan  3 17:26:32 2013
@@ -1244,6 +1244,7 @@
 	QList<PageItem*> DocItems;
 	QHash<int, PageItem*> FrameItems;
 	QList<PageItem*> EditFrameItems;
+	PageItem *currentEditedTextframe;
 	Selection* const m_Selection;
 	/** \brief Number of Columns */
 	double PageSp;