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

[Oliver Kellogg]

SVN commit 516638 by okellogg:

updateComponentSize(): Force call to setSize() in the wt_ForkJoin case.
BUG:120455


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


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #516637:516638
@@ -11,6 +11,7 @@
 * Documentation for association roles not saved (105661)
 * Default data types not added for old Java generator (115991)
 * Custom operations in sequence diagrams become class operations (120337)
+* Fork/join symbol appears as a black box (120455)
 * Multiplicity labels positioned incorrectly when moving entities (120598)
 * Types of entity's attributes are displayed instead of their names (120742)
 * Unable to delete entity from entity list in "UML Model" frame (120750)
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.cpp #516637:516638
@@ -1063,7 +1063,7 @@
     const QSize minSize = calculateSize();
     const int w = minSize.width();
     const int h = minSize.height();
-    if (getWidth() >= w && getHeight() >= h)
+    if (m_Type != Uml::wt_ForkJoin && getWidth() >= w && getHeight() >= h)
         return;
     setSize(w, h);
     adjustAssocs( getX(), getY() );  // adjust assoc lines