[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

setTextPosition(): Fix.


  M +11 -11    messagewidget.cpp   1.39


--- kdesdk/umbrello/umbrello/messagewidget.cpp  #1.38:1.39
@@ -208,9 +208,10 @@ void MessageWidget::setTextPosition() {
                 return;
         }
+        if (m_pFText->getText().isEmpty())
+                return;
         m_pFText->calculateSize();
         const int xLowerBound = getX() + 5;
         int ftX = m_pFText->getX();
-        if (ftX < xLowerBound ||
-            m_sequenceMessageType == sequence_message_synchronous)
+        if (ftX < xLowerBound || m_pFText->getRole() == tr_Seq_Message_Self)
                 ftX = xLowerBound;
         else {
@@ -306,5 +307,8 @@ bool MessageWidget::activate(IDChangeLog
         }
         if( !m_pFText ) {
-                m_pFText = new FloatingText( m_pView, tr_Seq_Message, "" );
+                Text_Role tr = tr_Seq_Message;
+                if (m_pOw[A] ==m_pOw[B])
+                        tr = tr_Seq_Message_Self;
+                m_pFText = new FloatingText( m_pView, tr, "" );
                 m_pFText->setFont(UMLWidget::getFont());
         } else if (m_pFText->getID() == -1) {
@@ -483,5 +487,5 @@ void MessageWidget::cleanup() {
 
 void MessageWidget::mouseMoveEvent(QMouseEvent *me) {
-        int newX = 0, newY = 0, count;
+        int newX = 0, newY = 0;
         int moveX, moveY;
         if( m_bResizing ) {
@@ -502,9 +506,9 @@ void MessageWidget::mouseMoveEvent(QMous
                 m_pView -> setSelected( this, me );
         m_bSelected = true;
-        count = m_pView -> getSelectCount();
-
         if( !m_bMouseDown )
                 if( me -> button() != LeftButton )
                         return;
+        int count = m_pView -> getSelectCount();
+
         //If not m_bStartMove means moving as part of selection
         //me->pos() will have the amount we need to move.
@@ -524,12 +528,8 @@ void MessageWidget::mouseMoveEvent(QMous
                         m_pView -> moveSelected( this, moveX, 0 );
         }
-        newX = getX() + moveX;
         newY = getY() + moveY;
-
-        newX = newX < 0?0:newX;
         newY = newY < 0?0:newY;
         if( count > 2 )
-                newY = this -> getY();
-        //only change y if not selected
+                newY = this -> getY();  //only change y if not selected
         newX = m_nPosX;
         newY = newY < getMinHeight() ? getMinHeight() : newY;