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

[Daniel Calviño Sánchez]

SVN commit 590635 by danxuliu:

Removed guard against a recursive call that doesn't happen anymore and caused message widget selection behaviour to be wrong.

 M  +0 -7      messagewidget.cpp  
 M  +0 -1      messagewidget.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/messagewidget.cpp #590634:590635
@@ -62,7 +62,6 @@
     m_pOw[Uml::A] = m_pOw[Uml::B] = NULL;
     m_pFText = NULL;
     m_nY = 0;
-    m_inSelection = false;
     setVisible(true);
 }
 
@@ -635,11 +634,6 @@
 }
 
 void MessageWidget::setSelected(bool _select) {
-    if( m_inSelection )//used to stop a recursive call
-    {
-        m_inSelection = false;
-        return;
-    }
     UMLWidget::setSelected( _select );
     if( !m_pFText || m_pFText->getDisplayText().isEmpty())
         return;
@@ -648,7 +642,6 @@
     if( !m_bSelected && !m_pFText -> getSelected() )
         return;
 
-    m_inSelection = true;
     m_pView -> setSelected( m_pFText, 0 );
     m_pFText -> setSelected( m_bSelected );
 }
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/messagewidget.h #590634:590635
@@ -378,7 +378,6 @@
     ObjectWidget * m_pOw[2];
     FloatingTextWidget * m_pFText;
     int m_nY;
-    bool m_inSelection;
 public slots:
     void slotWidgetMoved(Uml::IDType id);
     void slotMenuSelection(int sel);