[Uml-devel] branches/work/soc-umbrello/umbrello

[Gopala Krishna A]

SVN commit 856404 by gopala:

Make the default SizeHintOption parameter of NewUmlRectWidget::setMinimumSize
and NewUmlRectWidget::setMaximumSize to be DontAddMargin.

This is because, TextItemGroup geometry now also includes the
surrounding margin (which can be set). Hence setting of margin
externally for the widget is not needed most of the times as minimum
size of TextItemGroup automatically includes the margin.



 M  +0 -2      newumlrectwidget.cpp  
 M  +2 -2      newumlrectwidget.h  


--- branches/work/soc-umbrello/umbrello/newumlrectwidget.cpp #856403:856404
@@ -68,7 +68,6 @@
  *
  * @param option Adds (2 * margin()) to the size if
  *               "option = AddMargin". Otherwise adds nothing.
- *               Default value = AddMargin.
  *
  * This method only sets the variable m_minimumSize and doesn't update
  * the geometry. The geometry should be explicitly updated using
@@ -92,7 +91,6 @@
  *
  * @param option Adds (2 * margin()) to the size if
  *               "option = AddMargin". Otherwise adds nothing.
- *               Default value = AddMargin.
  *
  * This method only sets the variable m_maximumSize and doesn't update
  * the geometry. The geometry should be explicitly updated using
--- branches/work/soc-umbrello/umbrello/newumlrectwidget.h #856403:856404
@@ -61,13 +61,13 @@
 	QSizeF minimumSize() const {
 		return m_minimumSize;
 	}
-	void setMinimumSize(const QSizeF& newSize, SizeHintOption option = AddMargin);
+	void setMinimumSize(const QSizeF& newSize, SizeHintOption option = DontAddMargin);
 
 	/// @return The maximum size for this widget.
 	QSizeF maximumSize() const {
 		return m_maximumSize;
 	}
-	void setMaximumSize(const QSizeF& newSize, SizeHintOption option = AddMargin);
+	void setMaximumSize(const QSizeF& newSize, SizeHintOption option = DontAddMargin);
 
 	/// @return The current size of this widget.
     QSizeF size() const {