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

[Oliver Kellogg]

SVN commit 503621 by okellogg:

apply commit 503618 from branches/KDE/3.5

 M  +11 -4     messagewidget.cpp  
 M  +6 -0      messagewidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.cpp #503620:503621
@@ -46,8 +46,7 @@
         y -= m_pOw[Uml::B]->getHeight() / 2;
         m_pOw[Uml::B]->setY(y);
     }
-    UMLWidget::m_bResizable = (m_pOw[Uml::A] == m_pOw[Uml::B]);
-
+    updateResizability();
     calculateWidget();
     y = y < getMinHeight() ? getMinHeight() : y;
     y = y > getMaxHeight() ? getMaxHeight() : y;
@@ -76,6 +75,14 @@
 MessageWidget::~MessageWidget() {
 }
 
+void MessageWidget::updateResizability() {
+    if (m_sequenceMessageType == Uml::sequence_message_synchronous ||
+        m_pOw[Uml::A] == m_pOw[Uml::B])
+        UMLWidget::m_bResizable = true;
+    else
+        UMLWidget::m_bResizable = false;
+}
+
 void MessageWidget::draw(QPainter& p, int offsetX, int offsetY) {
     if(!m_pOw[Uml::A] || !m_pOw[Uml::B]) {
         return;
@@ -742,7 +749,7 @@
 
 void MessageWidget::setWidget(ObjectWidget * ow, Uml::Role_Type role) {
     m_pOw[role] = ow;
-    UMLWidget::m_bResizable = (m_pOw[Uml::A] == m_pOw[Uml::B]);
+    updateResizability();
 }
 
 ObjectWidget* MessageWidget::getWidget(Uml::Role_Type role) {
@@ -810,7 +817,7 @@
         << ID2STR(bId) << " is not an ObjectWidget" << endl;
         return false;
     }
-    UMLWidget::m_bResizable = (m_pOw[Uml::A] == m_pOw[Uml::B]);
+    updateResizability();
 
     UMLClassifier *c = dynamic_cast<UMLClassifier*>( pWB->getUMLObject() );
     if (c) {
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.h #503620:503621
@@ -372,6 +372,12 @@
      */
     static void drawSolidArrowhead(QPainter& p, int x, int y, Qt::ArrowType direction);
 
+    /**
+     * Update the UMLWidget::m_bResizable flag according to the
+     * charactersitics of this message.
+     */
+    void updateResizability();
+
     // Data loaded/saved
     QString m_SequenceNumber;
     QString m_CustomOp;