[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Fix beastie 68209, Widget sizes too small on load when large font is used
The saved font is now correctly loaded from the file


  M +3 -1      umlwidget.cpp   1.67
  M +2 -0      usecasewidget.cpp   1.6


--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.66:1.67
@@ -1043,5 +1043,7 @@ bool UMLWidget::loadFromXMI( QDomElement
 
         if( !font.isEmpty() ) {
-                m_Font.fromString( font );
+                QFont newFont;
+                newFont.fromString(font);
+                setFont(newFont);
         }
         m_bUseFillColour = (bool)usefillcolor.toInt();

--- kdesdk/umbrello/umbrello/usecasewidget.cpp  #1.5:1.6
@@ -15,4 +15,6 @@
 #include <qpainter.h>
 
+#include <kdebug.h>
+
 UseCaseWidget::UseCaseWidget(UMLView * view, UMLUseCase *o) : UMLWidget(view, o) {
         UMLWidget::setBaseType(wt_UseCase);