r22003 by jghali - #14773: "Paragraph Style:" current style is not accurate for Table Cells

[scribus-commit]

Author: jghali
Date: Tue Apr 25 17:22:19 2017
New Revision: 22003

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22003
Log:
#14773: "Paragraph Style:" current style is not accurate for Table Cells

Modified:
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22003&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp	Tue Apr 25 17:22:19 2017
@@ -238,6 +238,7 @@
 				m_table->moveTo(m_table->cellAt(canvasPoint));
 				m_view->slotSetCurs(event->globalPos().x(), event->globalPos().y());
 				m_lastCursorPos = m_table->activeCell().textFrame()->itemText.cursorPosition();
+				m_view->m_ScMW->setTBvals(m_table->activeCell().textFrame());
 				makeLongTextCursorBlink();
 				updateCanvas(true);
 				break;
@@ -360,6 +361,7 @@
 			m_cellSelectGesture->setup(m_table, activeCell);
 			m_view->startGesture(m_cellSelectGesture);
 		}
+		m_view->m_ScMW->setTBvals(newActiveFrame);
 	}
 	else
 	{

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22003&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp	Tue Apr 25 17:22:19 2017
@@ -289,6 +289,7 @@
 		{
 			m_view->requestMode(modeEditTable);
 			m_view->slotSetCurs(m->globalPos().x(), m->globalPos().y());
+			m_ScMW->setTBvals(currItem);
 		}
 	}
 }

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22003&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Tue Apr 25 17:22:19 2017
@@ -1470,8 +1470,6 @@
 
 	const ParagraphStyle& currPStyle( inEditMode ? item->currentStyle() : item->itemText.defaultStyle());
 	setAlignmentValue(currPStyle.alignment());
-	textPalette->textPal->showParStyle(currPStyle.parent());
-	textPalette->textPal->showCharStyle(item->currentCharStyle().parent());
 	doc->currentStyle = item->currentStyle();
 	if (doc->appMode == modeEdit || doc->appMode == modeEditTable)
 		item->currentTextProps(doc->currentStyle);
@@ -2809,8 +2807,6 @@
 		else
 		{
 			doc->currentStyle = currItem->itemText.defaultStyle();
-			textPalette->textPal->showParStyle(doc->currentStyle.parent());
-			textPalette->textPal->showCharStyle(doc->currentStyle.charStyle().parent());
 			emit TextStyle(doc->currentStyle);
 			// to go: (av)
 			textPalette->textPal->updateStyle(doc->currentStyle);
@@ -2821,8 +2817,9 @@
 		if (doc->appMode == modeEditTable)
 		{
 			charPalette->setEnabled(true, currItem);
-			PageItem *i2 = currItem->asTable()->activeCell().textFrame();
-			appModeHelper->enableTextActions(true, i2->currentCharStyle().font().scName());
+			PageItem *cellItem = currItem->asTable()->activeCell().textFrame();
+			setTBvals(cellItem);
+			appModeHelper->enableTextActions(true, cellItem->currentCharStyle().font().scName());
 		}
 		break;
 	case PageItem::PathText: //Path Text

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22003&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Tue Apr 25 17:22:19 2017
@@ -522,6 +522,9 @@
 	showFontSize(charStyle.fontSize());
 	showLanguage(charStyle.language());
 
+	showParStyle(newCurrent.parent());
+	showCharStyle(charStyle.parent());
+
 	bool tmp = m_haveItem;
 	m_haveItem = false;