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

[Ralf Habacker]

SVN commit 1274739 by habacker:

Fixed association text clipping problem when loading poseidon321.xmi

CCBUG: 291894

 M  +1 -0      umlview.cpp  
 M  +28 -0     widgets/associationwidget.cpp  
 M  +1 -0      widgets/associationwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1274738:1274739
@@ -3551,6 +3551,7 @@
                    rest of the diagram might load okay.
                  */
             } else {
+                assoc->clipSize();
                 if (!addAssociation(assoc, false)) {
                     uError() << "Could not addAssociation(" << assoc << ") to umlview, deleting.";
                     //               assoc->cleanup();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.cpp #1274738:1274739
@@ -3855,6 +3855,34 @@
     }
 }
 
+void AssociationWidget::clipSize()
+{
+    if( m_pName )
+        m_pName->clipSize();
+
+    if( m_role[A].m_pMulti )
+        m_role[A].m_pMulti->clipSize();
+
+    if( m_role[B].m_pMulti )
+        m_role[B].m_pMulti->clipSize();
+
+    if( m_role[A].m_pRole )
+        m_role[A].m_pRole->clipSize();
+
+    if( m_role[B].m_pRole )
+        m_role[B].m_pRole->clipSize();
+
+    if( m_role[A].m_pChangeWidget )
+        m_role[A].m_pChangeWidget->clipSize();
+
+    if( m_role[B].m_pChangeWidget )
+        m_role[B].m_pChangeWidget->clipSize();
+
+    if (m_pAssocClassWidget)
+        m_pAssocClassWidget->clipSize();
+}
+
+
 /**
  * Saves this widget to the "assocwidget" XMI element.
  */
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.h #1274738:1274739
@@ -560,6 +560,7 @@
      */
     void setUMLObject(UMLObject *obj);
 
+    void clipSize();
     /**
      * Saves this widget to the "assocwidget" XMI element.
      */