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

[Ralf Habacker]

SVN commit 1268761 by habacker:

fixed bug having too small widget width on a common place

 M  +0 -8      classifierwidget.cpp  
 M  +0 -7      objectwidget.cpp  
 M  +2 -3      umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/classifierwidget.cpp #1268760:1268761
@@ -74,14 +74,6 @@
     m_drawAsCircle = false;
     m_pAssocWidget = NULL;
 
-    /*
-       force calculation of the widget size to avoid too small widgets
-       -> merge with related part in ClassifierWidget
-       Q: could this not be handled in UMLWidget for all widgets ?
-    */
-    QSize size = calculateSize();
-    setSize(size.width(), size.height());
-
     setShowAttSigs( ops.classState.showAttSig );
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1268760:1268761
@@ -64,13 +64,6 @@
     } else {
         m_pLine = NULL;
     }
-    /*
-       force calculation of the widget size to avoid too small widgets
-       -> merge with related part in ClassifierWidget
-       Q: could this not be handled in UMLWidget for all widgets ?
-    */
-    QSize size = calculateSize();
-    setSize(size.width(), size.height());
 }
 
 ObjectWidget::~ObjectWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1268760:1268761
@@ -900,9 +900,8 @@
 {
     if (m_pDoc->loading())
         return;
-    const int w = getWidth();
-    const int h = getHeight();
-    setSize(w, h);
+    QSize size = calculateSize();
+    setSize(size.width(), size.height());
     adjustAssocs(getX(), getY());    // adjust assoc lines
 }