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

[Florence Mattler]

SVN commit 634102 by mattler:

Forbid drawing a precontidion out of a sequence line widget


 M  +4 -1      preconditionwidget.cpp  


--- branches/work/isi-umbrello/umbrello/umbrello/preconditionwidget.cpp #634101:634102
@@ -80,6 +80,9 @@
     if (y <= m_pOw[Uml::A]->getY() + m_pOw[Uml::A]->getHeight() ) {
 	y = m_pOw[Uml::A]->getY() + m_pOw[Uml::A]->getHeight() + 15;
     }
+    if (y + h >= m_pOw[Uml::A]->getEndLineY()) {
+        y = m_pOw[Uml::A]->getEndLineY() - h;
+    }
     setY(y);
     UMLWidget::setPen(p);
     if ( UMLWidget::getUseFillColour() ) {
@@ -112,7 +115,7 @@
     height = height > PRECONDITION_HEIGHT ? height : PRECONDITION_HEIGHT;
     width += PRECONDITION_MARGIN * 2;
     height += PRECONDITION_MARGIN * 2;
-   
+    
     return QSize(width, height);
 
 }