Consider frame width for annotation item minimum size

mhugent · mhugent · commit 9720ee9b6557 · 2010-04-20T07:55:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13329 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsformannotationitem.cpp b/src/gui/qgsformannotationitem.cpp
@@ -145,7 +145,8 @@ QSizeF QgsFormAnnotationItem::minimumFrameSize() const
 {
   if ( mDesignerWidget )
   {
-    return mDesignerWidget->minimumSize();
+    QSizeF widgetMinSize = mDesignerWidget->minimumSize();
+    return QSizeF( 2 * mFrameBorderWidth + widgetMinSize.width(), 2 * mFrameBorderWidth + widgetMinSize.width() );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ QSizeF QgsFormAnnotationItem::minimumFrameSize() const`
`145`	`145`	`{`
`146`	`146`	`if ( mDesignerWidget )`
`147`	`147`	`{`
`148`		`- return mDesignerWidget->minimumSize();`
	`148`	`+ QSizeF widgetMinSize = mDesignerWidget->minimumSize();`
	`149`	`+ return QSizeF( 2 * mFrameBorderWidth + widgetMinSize.width(), 2 * mFrameBorderWidth + widgetMinSize.width() );`
`149`	`150`	`}`
`150`	`151`	`else`
`151`	`152`	`{`