[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 655572 by okellogg:

updateComponentSize(): Let wt_Object proceed to setSize().
BUG:136869


 M  +1 -0      ChangeLog  
 M  +2 -1      umbrello/umlwidget.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #655571:655572
@@ -13,6 +13,7 @@
 * Crash on adding operation to class with Advanced Code Generators enabled (131528)
 * Javascript wrong Code Generation (135527)
 * Javascript Code Generation creates bad format methods (135540)
+* Sequence diagram object size incorrect after toggling "Draw as Actor" (136869)
 * Incorrect Association Properties text (139872)
 * Buttons are not displayed (139913)
 * Java 5 generics support (140669)
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.cpp #655571:655572
@@ -824,7 +824,8 @@
     const QSize minSize = calculateSize();
     const int w = minSize.width();
     const int h = minSize.height();
-    if (m_Type != Uml::wt_ForkJoin && getWidth() >= w && getHeight() >= h)
+    if (m_Type != Uml::wt_ForkJoin && m_Type != Uml::wt_Object &&
+        getWidth() >= w && getHeight() >= h)
         return;
     setSize(w, h);
     adjustAssocs( getX(), getY() );  // adjust assoc lines