r21223 by fschmid -

[scribus-commit]

Author: fschmid
Date: Sat Apr 23 07:59:45 2016
New Revision: 21223

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21223
Log:
Fixed Bug #13965: Text on path: start offset has not effect with centered text

Modified:
    trunk/Scribus/scribus/pageitem_pathtext.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21223&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp	Sat Apr 23 07:59:45 2016
@@ -221,7 +221,7 @@
 			CurX -= m_textDistanceMargins.left();
 		}
 		if (itemRenderText.paragraphStyle(0).alignment() == 1)
-			CurX = (totalCurveLen - totalTextLen) / 2.0;
+			CurX = ((totalCurveLen - totalTextLen) / 2.0) + m_textDistanceMargins.left();
 		if (itemRenderText.paragraphStyle(0).alignment() == 3)
 		{
 			if (spaceCount != 0)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21223&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sat Apr 23 07:59:45 2016
@@ -6319,6 +6319,7 @@
 				newItem->setLineColor(CommonStrings::None);
 				newItem->SetRectFrame();
 				newItem->setRedrawBounding();
+				newItem->setTextToFrameDistLeft(0);
 			}
 			break;
 		//We don't allow this right now

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21223&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Sat Apr 23 07:59:45 2016
@@ -577,6 +577,8 @@
 	Selection tempSelection(this, false);
 	tempSelection.addItem(m_item, true);
 	m_doc->itemSelection_SetAlignment(a, &tempSelection);
+	if (m_item->isPathText())
+		pathTextWidgets->handleSelectionChanged();
 }
 
 void PropertiesPalette_Text::handleTextFont(QString c)

Modified: trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21223&path=/trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp	Sat Apr 23 07:59:45 2016
@@ -104,6 +104,14 @@
 			flippedPathText->setChecked(m_item->textPathFlipped);
 			showCurveCheckBox->setChecked(m_item->PoShow);
 			distFromCurve->showValue(m_item->BaseOffs * -1 * m_unitRatio);
+			if (m_item->itemText.paragraphStyle(0).alignment() == 1)
+				startOffset->setMinimum(-3000);
+			else
+			{
+				if (m_item->textToFrameDistLeft() < 0)
+					m_item->setTextToFrameDistLeft(0);
+				startOffset->setMinimum(0);
+			}
 			startOffset->showValue(m_item->textToFrameDistLeft() * m_unitRatio);
 		}
 		connectSignals();
@@ -192,6 +200,7 @@
 	m_doc->adjustItemSize(m_item);
 	m_item->updatePolyClip();
 	m_item->update();
+	m_doc->regionsChanged()->update(QRect());
 }
 
 void PropertyWidget_PathText::handlePathType()