r21802 by craig - #14427: Remove calls to setMaximum on columns

scribus-commit scribus-commit at lists.scribus.net
Wed Mar 1 22:07:56 UTC 2017


Author: craig
Date: Wed Mar  1 22:07:56 2017
New Revision: 21802

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21802
Log:
#14427: Remove calls to setMaximum on columns

Modified:
    trunk/Scribus/scribus/ui/paintmanager.h
    trunk/Scribus/scribus/ui/propertywidget_distance.cpp

Modified: trunk/Scribus/scribus/ui/paintmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21802&path=/trunk/Scribus/scribus/ui/paintmanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.h	(original)
+++ trunk/Scribus/scribus/ui/paintmanager.h	Wed Mar  1 22:07:56 2017
@@ -40,7 +40,7 @@
 
 	public:
 		PaintManagerDialog(QWidget* parent, QHash<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QHash<QString, ScPattern> *docPatterns, ScribusDoc *doc, ScribusMainWindow* scMW);
-		~PaintManagerDialog() {};
+		~PaintManagerDialog() {}
 		/*! \brief Returns the name of the current/selected color set.
 		\retval QString selected name. */
 		QString getColorSetName();

Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21802&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp	Wed Mar  1 22:07:56 2017
@@ -125,7 +125,7 @@
 		textItem = m_item->asTable()->activeCell().textFrame();
 	if (!textItem) return;
 
-	columns->setMaximum(qMax(qRound(textItem->width() / qMax(textItem->ColGap, 10.0)), 1));
+	//#14427: columns->setMaximum(qMax(qRound(textItem->width() / qMax(textItem->ColGap, 10.0)), 1));
 	columns->setMinimum(1);
 	columns->setValue(textItem->Cols);
 	columnGap->setMinimum(0);
@@ -249,7 +249,7 @@
 
 		if (textItem != 0)
 		{
-			columns->setMaximum(qMax(qRound(textItem->width() / qMax(textItem->ColGap, 10.0)), 1));
+//#14427: columns->setMaximum(qMax(qRound(textItem->width() / qMax(textItem->ColGap, 10.0)), 1));
 			if (columnGapLabel->currentIndex() == 0)
 			{
 				columnGap->setMaximum(qMax((textItem->width() / textItem->Cols - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight()) * m_unitRatio, 0.0));




More information about the scribus-commit mailing list