[Uml-devel] branches/work/soc-umbrello/umbrello/widgets

[Andi Fischer]

SVN commit 1222842 by fischer:

Drawing of class and state adjusted to bring it closer to the common style.

 M  +2 -2      classifierwidget.cpp  
 M  +6 -4      statewidget.cpp  


--- branches/work/soc-umbrello/umbrello/widgets/classifierwidget.cpp #1222841:1222842
@@ -429,14 +429,14 @@
     else {
         // The elements not to be drawn will have null dimension and
         // hence it effectively is not drawn. (automatic ;) )
-        painter->drawRoundedRect(m_classifierRect, 5, 5);
+        painter->drawRoundedRect(m_classifierRect, 2, 2);
         painter->drawLines(m_classifierLines, 2);
 
         painter->setPen(QPen(Qt::NoPen));
         painter->setBrush(awesomeHeaderBrush());
         Uml::Corners corners(Uml::corner_TopLeft | Uml::corner_TopRight);
         Widget_Utils::drawRoundedRect(painter, textItemGroupAt(HeaderGroupIndex)->groupGeometry(),
-                5, 5, corners);
+                2, 2, corners);
 
         pen.setStyle(Qt::DotLine);
         painter->setPen(pen);
--- branches/work/soc-umbrello/umbrello/widgets/statewidget.cpp #1222841:1222842
@@ -23,13 +23,13 @@
 #include "umlscene.h"
 #include "umlview.h"
 
-// qt includes
-#include <QtCore/QPointer>
-
 // kde includes
 #include <klocale.h>
 #include <kinputdialog.h>
 
+// qt includes
+#include <QtCore/QPointer>
+
 const QSizeF StateWidget::MinimumEllipseSize(30, 10);
 
 /**
@@ -50,6 +50,8 @@
     switch (m_stateType) {
     case StateWidget::Normal:
         {
+            const QSizeF sz = QSizeF(90, 60);
+            setSize(sz);
         }
         break;
     case StateWidget::Initial:
@@ -132,7 +134,7 @@
     switch (m_stateType) {
     case StateWidget::Normal:
         {
-            painter->drawRoundRect(rect(), 50, 50);
+            painter->drawRoundedRect(rect(), 15, 15);
             painter->drawLines(m_separatorLines);
         }
         break;