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

[Andi Fischer]

SVN commit 1158505 by fischer:

Fixing the shrinking of notes when closing the properties dialog.

 M  +0 -24     controller/notewidgetcontroller.cpp  
 M  +1 -4      controller/notewidgetcontroller.h  
 U             umlview.cpp  
 M  +1 -3      widgets/notewidget.cpp  
 M  +2 -3      widgets/umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/controller/notewidgetcontroller.cpp #1158504:1158505
@@ -35,30 +35,6 @@
 
 /**
  * Overridden from UMLWidgetController.
- * Handles a mouse move event.
- * Executes base code
- *
- * @param me The QMouseEvent event.
- */
-void NoteWidgetController::mouseMoveEvent(QMouseEvent *me)
-{
-    UMLWidgetController::mouseMoveEvent(me);
-}
-
-/**
- * Overridden from UMLWidgetController.
- * Handles a mouse release event.
- * Executes base code and then draws the text in the note.
- *
- * @param me The QMouseEvent event.
- */
-void NoteWidgetController::mouseReleaseEvent(QMouseEvent *me)
-{
-    UMLWidgetController::mouseReleaseEvent(me);
-}
-
-/**
- * Overridden from UMLWidgetController.
  * Executes the action for double click in the widget.
  * Shows the dialog to change the text of the note.
  *
--- trunk/KDE/kdesdk/umbrello/umbrello/controller/notewidgetcontroller.h #1158504:1158505
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2006-2009                                               *
+ *   copyright (C) 2006-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -32,9 +32,6 @@
     NoteWidgetController(NoteWidget* noteWidget);
     virtual ~NoteWidgetController();
 
-    virtual void mouseMoveEvent(QMouseEvent* me);
-    virtual void mouseReleaseEvent(QMouseEvent * me);
-
 protected:
 
     virtual void doMouseDoubleClick(QMouseEvent *me);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/notewidget.cpp #1158504:1158505
@@ -20,7 +20,7 @@
 #include <kinputdialog.h>
 // app includes
 #include "notewidgetcontroller.h"
-#include "dialogs/notedialog.h"
+#include "notedialog.h"
 #include "umldoc.h"
 #include "umlview.h"
 #include "uml.h"
@@ -186,8 +186,6 @@
     }
     else {
         // keep width and height unchanged
-        width = getWidth();
-        height = getHeight();
     }
     return QSize(width, height);
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1158504:1158505
@@ -896,9 +896,8 @@
 {
     if (m_pDoc->loading())
         return;
-    const QSize minSize = calculateSize();
-    const int w = minSize.width();
-    const int h = minSize.height();
+    const int w = getWidth();
+    const int h = getHeight();
     setSize(w, h);
     adjustAssocs(getX(), getY());    // adjust assoc lines
 }