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

[Gopala Krishna A]

SVN commit 856368 by gopala:

* Chopped margin code from DataTypeWidget as TextItemGroup handles it.
* Explicitly specify margin addition in ComponenetWidget::setMinimumSize.



 M  +1 -2      componentwidget.cpp  
 M  +1 -2      datatypewidget.cpp  


--- branches/work/soc-umbrello/umbrello/componentwidget.cpp #856367:856368
@@ -79,8 +79,7 @@
 		minSize.setHeight(minHeight);
 	}
 
-	// Note: Adds 2 * margin() to both width and height!
-	setMinimumSize(minSize);
+	setMinimumSize(minSize, NewUMLRectWidget::AddMargin);
 
 	NewUMLRectWidget::updateGeometry();
 }
--- branches/work/soc-umbrello/umbrello/datatypewidget.cpp #856367:856368
@@ -98,8 +98,7 @@
 {
     if(change == SizeHasChanged) {
 		TextItemGroup *grp = textItemGroupAt(DatatypeWidget::GroupIndex);
-		const qreal m = margin();
-		grp->setGroupGeometry(rect().adjusted(+m, +m, -m, -m));
+		grp->setGroupGeometry(rect());
 	}
     return NewUMLRectWidget::attributeChange(change, oldValue);
 }