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

[Ralf Habacker]

SVN commit 1274742 by habacker:

Using setFont() in the constructor does not work in all cases
probably because of doc->loading() not. Also we need to skip the
call to updateComponentSize() when loading.

CCBUG: 291894

 M  +4 -1      umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1274741:1274742
@@ -298,7 +298,8 @@
         m_usesDiagramUseFillColor = true;
         const Settings::OptionState& optionState = m_scene->optionState();
         m_FillColor = optionState.uiState.fillColor;
-        setFont(optionState.uiState.font);
+        // FIXME: using setFont() here let umbrello hang probably because of doc->loading() not set. 
+        m_Font = optionState.uiState.font;
         m_showStereotype = optionState.classState.showStereoType;
     } else {
         uError() << "SERIOUS PROBLEM - m_scene is NULL";
@@ -1367,6 +1368,8 @@
                 setDefaultFontMetrics((UMLWidget::FontType)i2, *painter);
         }
     }
+    if (m_doc->loading())
+        return;
     // calculate the size, based on the new font metric
     updateComponentSize();
 }